The Remove and HowManyStartsWithPrefix functions have been changed

Author: MinyazevR

Homework2/Bor/Bor/Bor.cs

@@ -72,6 +72,7 @@ public bool Contains(string element)
             {
                 continue;
             }
+
             return false;
         }
 
@@ -107,18 +108,9 @@ public int HowManyStartWithPrefix(string prefix)
     }
 
     // Function for clearing dictionaries
-    static private void ClearDictionaryAndNode(string element, int index, Node? node)
+    static private void ClearDictionaryAndNode(Node node)
     {
-        if (index + 1 < element.Length - 1 && node != null)
-        {
-            node = node.Nodes[element[index + 1]];
-            ClearDictionaryAndNode(element, index + 1, node);
-        }
-
-        if (node != null)
-        {
-            node.Nodes.Clear();
-        }
+        node.Nodes.Clear();
     }
 
     /// <summary>
@@ -134,22 +126,44 @@ public bool Remove(string element)
         }
 
         int index = 0;
-        Node? node = root;
+        Node node = root;
+        Node? anotherNode = null;
         for (int i = 0; i < element.Length; i++)
         {
             if (node != null)
             {
                 node = node.Nodes[element[i]];
+
+                if (node.Nodes.Count == 0 && i == element.Length - 1)
+                {
+                    if (anotherNode != null)
+                    {
+                        ClearDictionaryAndNode(anotherNode);
+                        Size -= i - index;
+                        return true;
+                    }
+                    else
+                    {
+                        ClearDictionaryAndNode(root);
+                        Size = 0;
+                        return true;
+                    }
+                }
+
+                if (node.Nodes.Count != 0 && i == element.Length - 1)
+                {
+                    node.IsTerminal = false;
+                    return true;
+                }
             }
 
-            string subString = element[0..(i + 1)];
-            if (HowManyStartWithPrefix(subString) < 2)
+            if (node != null && node.IsTerminal)
             {
                 index = i;
-                break;
+                anotherNode = node;
             }
+
         }
-        ClearDictionaryAndNode(element, index, node);
         return true;
     }
 }

Homework2/Bor/BorTest/BorTest.cs

@@ -59,7 +59,7 @@ public void ShouldExpectedFalseWhenContainsForRemovedString()
     public void ShouldExpected5WhenSizeForBorContains5Node()
     {
         Assert.IsTrue(bor.Add("hello"));
-        Assert.AreEqual(5, bor?.Size);
+        Assert.AreEqual(5, bor.Size);
     }
 
     [Test]
@@ -80,7 +80,7 @@ public void ShouldBorSizeEqual8WhenAddStringLength3WithNonExistingFirstSymbolFor
     }
 
     [Test]
-    public void ShouldExpected2WhenHowManyStartWithPrefixForBorContains2StringWhichStartWithThisPrefix()
+    public void ShouldExpected2WhenHowManyStartWithPrefixForBorContains2StringWhichStartWithSamePrefix()
     {
         Assert.IsTrue(bor.Add("hello"));
         Assert.IsTrue(bor.Add("hel"));