From c2a586086729116ecf4f14bfaf2de027d71d1fad Mon Sep 17 00:00:00 2001 From: Alex Macocian Date: Thu, 20 Jun 2019 12:08:34 +0200 Subject: [PATCH] Modified Add method for consistency --- SystemExtensions/Collections/BinaryHeap.cs | 6 ++-- SystemExtensions/Collections/FibonacciHeap.cs | 8 ++--- SystemExtensions/Collections/PriorityQueue.cs | 2 +- .../Collections/BinaryHeapTests.cs | 16 ++++----- .../Collections/FibonacciHeapTests.cs | 34 +++++++++---------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/SystemExtensions/Collections/BinaryHeap.cs b/SystemExtensions/Collections/BinaryHeap.cs index 6af65aa..398588e 100644 --- a/SystemExtensions/Collections/BinaryHeap.cs +++ b/SystemExtensions/Collections/BinaryHeap.cs @@ -82,10 +82,10 @@ namespace SystemExtensions.Collections #endregion #region Public Methods /// - /// Insertion operation into the queue + /// Adds value to the queue. /// - /// Value to be inserted - public void Insert(T value) + /// Value to be added. + public void Add(T value) { if(count == Capacity - 1) { diff --git a/SystemExtensions/Collections/FibonacciHeap.cs b/SystemExtensions/Collections/FibonacciHeap.cs index f97f2cd..d364727 100644 --- a/SystemExtensions/Collections/FibonacciHeap.cs +++ b/SystemExtensions/Collections/FibonacciHeap.cs @@ -52,10 +52,10 @@ namespace SystemExtensions.Collections #endregion #region Public Methods /// - /// Inserts value into the heap. + /// Adds value to the heap. /// - /// Value to be inserted. - public void Insert(T value) + /// Value to be added. + public void Add(T value) { FibonacciNode node = new FibonacciNode(); node.Value = value; @@ -81,7 +81,7 @@ namespace SystemExtensions.Collections /// Remove the minimum value from the heap. /// /// Minimum value. - public T RemoveMinimum() + public T Remove() { FibonacciNode currentRoot = root; if (currentRoot != null) diff --git a/SystemExtensions/Collections/PriorityQueue.cs b/SystemExtensions/Collections/PriorityQueue.cs index f128fab..d4f6b21 100644 --- a/SystemExtensions/Collections/PriorityQueue.cs +++ b/SystemExtensions/Collections/PriorityQueue.cs @@ -47,7 +47,7 @@ namespace SystemExtensions.Collections /// Value to be added to the queue. public void Enqueue(T value) { - binaryHeap.Insert(value); + binaryHeap.Add(value); } /// /// Pops the queue and removes the highest priority value from the queue. diff --git a/SystemExtensionsTests/Collections/BinaryHeapTests.cs b/SystemExtensionsTests/Collections/BinaryHeapTests.cs index aae01a3..244ea98 100644 --- a/SystemExtensionsTests/Collections/BinaryHeapTests.cs +++ b/SystemExtensionsTests/Collections/BinaryHeapTests.cs @@ -40,7 +40,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 0; i < 100; i++) { - binaryHeap.Insert(i * 20 - (50 + i)); + binaryHeap.Add(i * 20 - (50 + i)); } } catch (Exception e) @@ -81,7 +81,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 0; i < 1000; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } if (binaryHeap.Min != 0 || binaryHeap.Max != 999) { @@ -94,7 +94,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 0; i < 100; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } binaryHeap.Clear(); if (binaryHeap.Count > 0 || binaryHeap.Capacity != 160) @@ -108,7 +108,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 100; i < 200; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } binaryHeap.Clear(false); int[] array = binaryHeap.ToArray(); @@ -130,7 +130,7 @@ namespace SystemExtensions.Collections.Tests [TestMethod()] public void ContainsTest() { - binaryHeap.Insert(100); + binaryHeap.Add(100); if (!binaryHeap.Contains(100)) { Assert.Fail(); @@ -142,7 +142,7 @@ namespace SystemExtensions.Collections.Tests { for(int i = 0; i < 1000; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } int[] array = binaryHeap.ToArray(); if(array.Length != binaryHeap.Count) @@ -160,7 +160,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 0; i < 1000; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } int count = 0; foreach(int value in binaryHeap) @@ -183,7 +183,7 @@ namespace SystemExtensions.Collections.Tests BinaryHeap binaryHeap2 = new BinaryHeap(); for (int i = 0; i < 100; i++) { - binaryHeap.Insert(i); + binaryHeap.Add(i); } BinaryFormatter serializer = new BinaryFormatter(); string s = string.Empty; diff --git a/SystemExtensionsTests/Collections/FibonacciHeapTests.cs b/SystemExtensionsTests/Collections/FibonacciHeapTests.cs index 8856e44..9396014 100644 --- a/SystemExtensionsTests/Collections/FibonacciHeapTests.cs +++ b/SystemExtensionsTests/Collections/FibonacciHeapTests.cs @@ -20,7 +20,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 0; i < 1000; i++) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } } @@ -42,12 +42,12 @@ namespace SystemExtensions.Collections.Tests for(int i = 0; i < 100; i++) { - fibonacciHeap1.Insert(i); + fibonacciHeap1.Add(i); } for(int i = 100; i < 300; i++) { - fibonacciHeap2.Insert(i); + fibonacciHeap2.Add(i); } fibonacciHeap1.Merge(fibonacciHeap2); @@ -65,7 +65,7 @@ namespace SystemExtensions.Collections.Tests { try { - fibonacciHeap.RemoveMinimum(); + fibonacciHeap.Remove(); Assert.Fail(); } catch(IndexOutOfRangeException exception) @@ -78,11 +78,11 @@ namespace SystemExtensions.Collections.Tests } for (int i = 0; i < 1000; i++) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } for (int i = 0; i < 1000; i++) { - if (fibonacciHeap.RemoveMinimum() != i) + if (fibonacciHeap.Remove() != i) { Assert.Fail(); } @@ -92,16 +92,16 @@ namespace SystemExtensions.Collections.Tests [TestMethod()] public void DecreaseKeyTest() { - fibonacciHeap.Insert(5); - fibonacciHeap.Insert(10); - fibonacciHeap.Insert(7); + fibonacciHeap.Add(5); + fibonacciHeap.Add(10); + fibonacciHeap.Add(7); fibonacciHeap.DecreaseKey(5, 3); if(fibonacciHeap.Contains(5) || !fibonacciHeap.Contains(3)) { Assert.Fail(); } fibonacciHeap.DecreaseKey(10, 1); - if(fibonacciHeap.RemoveMinimum() != 1) + if(fibonacciHeap.Remove() != 1) { Assert.Fail(); } @@ -112,7 +112,7 @@ namespace SystemExtensions.Collections.Tests { for(int i = 0; i < 10000; i++) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } if (!fibonacciHeap.Contains(5124)) { @@ -125,9 +125,9 @@ namespace SystemExtensions.Collections.Tests { for(int i = 0; i < 10000; i++) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } - fibonacciHeap.RemoveMinimum(); + fibonacciHeap.Remove(); fibonacciHeap.Clear(); if(fibonacciHeap.Count > 0) { @@ -140,9 +140,9 @@ namespace SystemExtensions.Collections.Tests { for(int i = 999; i >= 0; i--) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } - fibonacciHeap.RemoveMinimum(); + fibonacciHeap.Remove(); int[] arr = fibonacciHeap.ToArray(); for(int i = 1; i < 512; i++) @@ -159,7 +159,7 @@ namespace SystemExtensions.Collections.Tests { for (int i = 999; i >= 0; i--) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } int count = 0; @@ -184,7 +184,7 @@ namespace SystemExtensions.Collections.Tests FibonacciHeap fibonacciHeap2 = new FibonacciHeap(); for (int i = 0; i < 100; i++) { - fibonacciHeap.Insert(i); + fibonacciHeap.Add(i); } BinaryFormatter serializer = new BinaryFormatter(); string s = string.Empty;