lab_8

AirFighter/AirFighter/AirFighterCollectionInfo.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter.Generics
+{
+    internal class AirFighterCollectionInfo : IEquatable<AirFighterCollectionInfo>
+    {
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public AirFighterCollectionInfo(string name, string description)
+        {
+            Name = name;
+            Description = description;
+        }
+        public bool Equals(AirFighterCollectionInfo? other)
+        {
+            return Name == other.Name;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.Name.GetHashCode();
+        }
+    }
+}

AirFighter/AirFighter/AirFighterCompareByColor .cs

@@ -0,0 +1,50 @@
+using AirFighter.DrawningObjects;
+using AirFighter.Entities;
+using AirFighter.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class fighterCompareByColor : IComparer<DrawningAirFighter?>
+    {
+        public int Compare(DrawningAirFighter? x, DrawningAirFighter? y)
+        {
+            if (x == null || x.EntityAirFighter == null)
+                throw new ArgumentNullException(nameof(x));
+
+            if (y == null || y.EntityAirFighter == null)
+                throw new ArgumentNullException(nameof(y));
+
+            if (x.EntityAirFighter.BodyColor.Name != y.EntityAirFighter.BodyColor.Name)
+            {
+                return x.EntityAirFighter.BodyColor.Name.CompareTo(y.EntityAirFighter.BodyColor.Name);
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                if (x is EntityAirFighter)
+                    return -1;
+                else
+                    return 1;
+            }
+            if (x.GetType().Name == y.GetType().Name && x is DrawningAirFighterMilitary)
+            {
+                EntityAirFighterMilitary EntityX = (EntityAirFighterMilitary)x.EntityAirFighter;
+                EntityAirFighterMilitary EntityY = (EntityAirFighterMilitary)y.EntityAirFighter;
+                if (EntityX.AdditionalColor.Name != EntityY.AdditionalColor.Name)
+                {
+                    return EntityX.AdditionalColor.Name.CompareTo(EntityY.AdditionalColor.Name);
+                }
+            }
+            var speedCompare = x.EntityAirFighter.Speed.CompareTo(y.EntityAirFighter.Speed);
+
+            if (speedCompare != 0)
+                return speedCompare;
+
+            return x.EntityAirFighter.Weight.CompareTo(y.EntityAirFighter.Weight);
+        }
+    }
+}

AirFighter/AirFighter/AirFighterCompareByType.cs

@@ -0,0 +1,32 @@
+using AirFighter.DrawningObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class AirFighterCompareByType : IComparer<DrawningAirFighter?>
+    {
+        public int Compare(DrawningAirFighter? x, DrawningAirFighter? y)
+        {
+            if (x == null || x.EntityAirFighter == null)
+                throw new ArgumentNullException(nameof(x));
+
+            if (y == null || y.EntityAirFighter == null)
+                throw new ArgumentNullException(nameof(y));
+
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return x.GetType().Name.CompareTo(y.GetType().Name);
+            }
+            var speedCompare = x.EntityAirFighter.Speed.CompareTo(y.EntityAirFighter.Speed);
+
+            if (speedCompare != 0)
+                return speedCompare;
+
+            return x.EntityAirFighter.Weight.CompareTo(y.EntityAirFighter.Weight);
+        }
+    }
+}

AirFighter/AirFighter/AirFighterGenericCollection.cs

@@ -21,6 +21,7 @@ namespace AirFighter.Generics
         private readonly int _placeSizeHeight = 180;
 
         private readonly SetGeneric<T> _collection;
+        public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
         public AirFighterGenericCollection(int picWidth, int picHeight)
         {
             int width = picWidth / _placeSizeWidth;
@@ -29,13 +30,13 @@ namespace AirFighter.Generics
             _pictureHeight = picHeight;
             _collection = new SetGeneric<T>(width * height);
         }
-        public static int? operator +(AirFighterGenericCollection<T, U> collect, T? obj)
+        public static bool operator +(AirFighterGenericCollection<T, U> collect, T? obj)
         {
             if (obj == null)
             {
-                return -1;
+                return false;
             }
-            return collect?._collection.Insert(obj);
+            return collect?._collection.Insert(obj, new DrawningAirFighterEqutables()) ?? false;
         }
         public static T operator -(AirFighterGenericCollection<T, U> collect, int pos)
         {

AirFighter/AirFighter/AirFighterGenericStorage.cs

@@ -14,37 +14,49 @@ namespace AirFighter.Generics
 {
     internal class AirFighterGenericStorage
     {
-        readonly Dictionary<string, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>> _fighterStorages;
+        readonly Dictionary<AirFighterCollectionInfo, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>> _fighterStorages;
 
-        public List<string> Keys => _fighterStorages.Keys.ToList();
+        public List<AirFighterCollectionInfo> Keys => _fighterStorages.Keys.ToList();
 
         private readonly int _pictureWidth;
         private readonly int _pictureHeight;
         public AirFighterGenericStorage(int pictureWidth, int pictureHeight)
         {
-            _fighterStorages = new Dictionary<string, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>>();
+            _fighterStorages = new Dictionary<AirFighterCollectionInfo, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
         public void AddSet(string name)
         {
-            if (_fighterStorages.ContainsKey(name)) return;
+            // TODO Прописать логику для добавления
-            _fighterStorages[name] = new AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>(_pictureWidth, _pictureHeight);
+            if (!_fighterStorages.ContainsKey(new AirFighterCollectionInfo(name, string.Empty)))
+            {
+                var fighterCollection = new AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>(_pictureWidth, _pictureHeight);
+                _fighterStorages.Add(new AirFighterCollectionInfo(name, string.Empty), fighterCollection);
+            }
         }
 
         public void DelSet(string name)
         {
-            if (!_fighterStorages.ContainsKey(name)) return;
+            // TODO Прописать логику для удаления
-            _fighterStorages.Remove(name);
+            if (_fighterStorages.ContainsKey(new AirFighterCollectionInfo(name, string.Empty)))
+            {
+                _fighterStorages.Remove(new AirFighterCollectionInfo(name, string.Empty));
+            }
         }
 
-        public AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>?
+        public AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>? this[string ind]
-        this[string ind]
         {
             get
             {
-                if (_fighterStorages.ContainsKey(ind)) return _fighterStorages[ind];
+                AirFighterCollectionInfo indObj = new AirFighterCollectionInfo(ind, string.Empty);
+                // TODO Продумать логику получения набора
+                if (_fighterStorages.ContainsKey(indObj))
+                {
+                    return _fighterStorages[indObj];
+                }
                 return null;
+
             }
         }
 
@@ -60,7 +72,7 @@ namespace AirFighter.Generics
                 File.Delete(filename);
             }
             StringBuilder data = new();
-            foreach (KeyValuePair<string, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>> record in _fighterStorages)
+            foreach (KeyValuePair<AirFighterCollectionInfo, AirFighterGenericCollection<DrawningAirFighter, DrawningObjectAirFighter>> record in _fighterStorages)
             {
                 StringBuilder records = new();
                 foreach (DrawningAirFighter? elem in record.Value.GetAirFighter)
@@ -129,7 +141,7 @@ namespace AirFighter.Generics
                             }
                         }
                     }
-                    _fighterStorages.Add(name, collection);
+                    _fighterStorages.Add(new AirFighterCollectionInfo(name, string.Empty), collection);
                 }
             }
         }

AirFighter/AirFighter/DrawningAirFighterEqutables.cs

@@ -0,0 +1,59 @@
+using AirFighter.DrawningObjects;
+using AirFighter.Entities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirFighter
+{
+    internal class DrawningAirFighterEqutables : IEqualityComparer<DrawningAirFighter?>
+    {
+        public bool Equals(DrawningAirFighter? x, DrawningAirFighter? y)
+        {
+            if (x == null || x.EntityAirFighter == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityAirFighter == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return false;
+            }
+            if (x.EntityAirFighter.Speed != y.EntityAirFighter.Speed)
+            {
+                return false;
+            }
+            if (x.EntityAirFighter.Weight != y.EntityAirFighter.Weight)
+            {
+                return false;
+            }
+            if (x.EntityAirFighter.BodyColor != y.EntityAirFighter.BodyColor)
+            {
+                return false;
+            }
+            if (x is EntityAirFighterMilitary && y is EntityAirFighterMilitary)
+            {
+                EntityAirFighterMilitary EntityX = (EntityAirFighterMilitary)x.EntityAirFighter;
+                EntityAirFighterMilitary EntityY = (EntityAirFighterMilitary)y.EntityAirFighter;
+                if (EntityX.AdditionalColor != EntityY.AdditionalColor)
+                    return false;
+                if (EntityX.Wing != EntityY.Wing)
+                    return false;
+                if (EntityX.Rocket != EntityY.Rocket)
+                    return false;
+            }
+            return true;
+        }
+
+        public int GetHashCode([DisallowNull] DrawningAirFighter obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+}

AirFighter/AirFighter/FormAirFighterCollection.Designer.cs

@@ -29,6 +29,8 @@
         private void InitializeComponent()
         {
             groupBox1 = new GroupBox();
+            ButtonSortByType = new Button();
+            ButtonSortByColor = new Button();
             groupBox2 = new GroupBox();
             buttonDelObject = new Button();
             listBoxStorage = new ListBox();
@@ -53,6 +55,8 @@
             // 
             // groupBox1
             // 
+            groupBox1.Controls.Add(ButtonSortByType);
+            groupBox1.Controls.Add(ButtonSortByColor);
             groupBox1.Controls.Add(groupBox2);
             groupBox1.Controls.Add(maskedTextBoxNumber);
             groupBox1.Controls.Add(buttonRemoveFighter);
@@ -65,6 +69,26 @@
             groupBox1.TabStop = false;
             groupBox1.Text = "Инструменты";
             // 
+            // ButtonSortByType
+            // 
+            ButtonSortByType.Location = new Point(17, 251);
+            ButtonSortByType.Name = "ButtonSortByType";
+            ButtonSortByType.Size = new Size(166, 23);
+            ButtonSortByType.TabIndex = 3;
+            ButtonSortByType.Text = "Сортировка по типу";
+            ButtonSortByType.UseVisualStyleBackColor = true;
+            ButtonSortByType.Click += ButtonSortByType_Click;
+            // 
+            // ButtonSortByColor
+            // 
+            ButtonSortByColor.Location = new Point(17, 280);
+            ButtonSortByColor.Name = "ButtonSortByColor";
+            ButtonSortByColor.Size = new Size(166, 23);
+            ButtonSortByColor.TabIndex = 4;
+            ButtonSortByColor.Text = "Сортировка по цвету";
+            ButtonSortByColor.UseVisualStyleBackColor = true;
+            ButtonSortByColor.Click += ButtonSortByColor_Click;
+            // 
             // groupBox2
             // 
             groupBox2.Controls.Add(buttonDelObject);
@@ -73,14 +97,14 @@
             groupBox2.Controls.Add(textBoxStorageName);
             groupBox2.Location = new Point(3, 19);
             groupBox2.Name = "groupBox2";
-            groupBox2.Size = new Size(200, 284);
+            groupBox2.Size = new Size(200, 226);
             groupBox2.TabIndex = 6;
             groupBox2.TabStop = false;
             groupBox2.Text = "Наборы";
             // 
             // buttonDelObject
             // 
-            buttonDelObject.Location = new Point(18, 244);
+            buttonDelObject.Location = new Point(18, 188);
             buttonDelObject.Name = "buttonDelObject";
             buttonDelObject.Size = new Size(159, 34);
             buttonDelObject.TabIndex = 2;
@@ -94,7 +118,7 @@
             listBoxStorage.ItemHeight = 15;
             listBoxStorage.Location = new Point(15, 88);
             listBoxStorage.Name = "listBoxStorage";
-            listBoxStorage.Size = new Size(162, 139);
+            listBoxStorage.Size = new Size(162, 94);
             listBoxStorage.TabIndex = 2;
             listBoxStorage.SelectedIndexChanged += listBoxStorage_SelectedIndexChanged;
             // 
@@ -183,14 +207,14 @@
             // SaveToolStripMenuItem
             // 
             SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(180, 22);
+            SaveToolStripMenuItem.Size = new Size(133, 22);
             SaveToolStripMenuItem.Text = "Сохранить";
             SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
             // 
             // LoadToolStripMenuItem
             // 
             LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(180, 22);
+            LoadToolStripMenuItem.Size = new Size(133, 22);
             LoadToolStripMenuItem.Text = "Загрузить";
             LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
             // 
@@ -244,5 +268,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog1;
         private SaveFileDialog saveFileDialog1;
+        private Button ButtonSortByType;
+        private Button ButtonSortByColor;
     }
 }

AirFighter/AirFighter/FormAirFighterCollection.cs

@@ -107,7 +107,7 @@ namespace AirFighter
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-       
+
         private void ButtonAddAirFighter_Click(object sender, EventArgs e)
         {
             if (listBoxStorage.SelectedIndex == -1)
@@ -173,7 +173,7 @@ namespace AirFighter
             }
             else
             {
-                MessageBox.Show("Не удалось удалить объект");                                              
+                MessageBox.Show("Не удалось удалить объект"); _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorage.SelectedItem.ToString()}");
                 _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorage.SelectedItem.ToString()}");
             }
         }
@@ -234,6 +234,27 @@ namespace AirFighter
                 }
             }
         }
+
+        private void ButtonSortByType_Click(object sender, EventArgs e) => CompareAirFighter(new AirFighterCompareByType());
+
+        private void ButtonSortByColor_Click(object sender, EventArgs e) => CompareAirFighter(new fighterCompareByColor());
+        //сортировка
+        private void CompareAirFighter(IComparer<DrawningAirFighter?> comparer)
+        {
+            if (listBoxStorage.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxStorage.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            obj.Sort(comparer);
+            pictureBoxCollection.Image = obj.ShowAirFighter();
+        }
+
     }
 }
 

AirFighter/AirFighter/SetGeneric.cs

@@ -14,41 +14,26 @@ namespace AirFighter.Generics
             _maxCount = count;
             _places = new List<T?>(count);
         }
-        public int Insert(T fighter)
+        public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
+        public bool Insert(T fighter, IEqualityComparer<T>? equal = null)
         {
-            if (_places.Count == 0)
+            Insert(fighter, 0, equal);
-            {
+            return true;
-                _places.Add(fighter);
-                return 0;
-            }
-            else
-            {
-                if (_places.Count < _maxCount)
-                {
-                    _places.Add(fighter);
-                    for (int i = 0; i < _places.Count; i++)
-                    {
-                        T temp = _places[i];
-                        _places[i] = _places[_places.Count - 1];
-                        _places[_places.Count - 1] = temp;
-                    }
-                    return 0;
-                }
-                else
-                {
-                    throw new StorageOverflowException(_places.Count);
-                }
-            }
 
         }
-        public bool Insert(T fighter, int position)
+        public bool Insert(T fighter, int position, IEqualityComparer<T>? equal = null)
         {
             if (position < 0 || position >= _maxCount)
                 throw new AirFighterNotFoundException(position);
 
             if (Count >= _maxCount)
                 throw new StorageOverflowException(position);
-            _places.Insert(0, fighter);
+            if (equal != null)
+            {
+                if (_places.Contains(fighter, equal))
+                    throw new ArgumentException(nameof(fighter));
+            }
+            _places.Insert(position, fighter);
             return true;
         }
         public bool Remove(int position)

AirFighter/AirFighter/appsettings.json

@@ -14,7 +14,7 @@
     ],
     "Enrich": [ "FromLogContext", "WithShipName", "WithThreadId" ],
     "Properties": {
-      "Application": "AirFighter"
+      "Application": "ContainerShip"
     }
   }
 }