From 5bac76d7a505c43aad6d0a32cd39982f4b927eac Mon Sep 17 00:00:00 2001
From: dangbb <51513363+dangbb@users.noreply.github.com>
Date: Sat, 21 May 2022 21:02:53 +0700
Subject: [PATCH] Fix `iter_merge_sort` bug (#6153)

* Fixed bug where array length 2 can't be sorted

* Add MCC and DU path test

Add test to conversions/octal_to_decimal.py and sorts\iterative_merge_sort.py

* ""

* Update octal_to_decimal.py

Co-authored-by: John Law <johnlaw.po@gmail.com>
---
 conversions/octal_to_decimal.py | 36 +++++++++++++++++++++++++++++++++
 sorts/iterative_merge_sort.py   | 24 ++++++++++++++++++++--
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/conversions/octal_to_decimal.py b/conversions/octal_to_decimal.py
index 5a7373fef..551311e26 100644
--- a/conversions/octal_to_decimal.py
+++ b/conversions/octal_to_decimal.py
@@ -2,12 +2,48 @@ def oct_to_decimal(oct_string: str) -> int:
     """
     Convert a octal value to its decimal equivalent
 
+    >>> oct_to_decimal("")
+    Traceback (most recent call last):
+    ...
+    ValueError: Empty string was passed to the function
+    >>> oct_to_decimal("-")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("e")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("8")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("-e")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("-8")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("1")
+    1
+    >>> oct_to_decimal("-1")
+    -1
     >>> oct_to_decimal("12")
     10
     >>> oct_to_decimal(" 12   ")
     10
     >>> oct_to_decimal("-45")
     -37
+    >>> oct_to_decimal("-")
+    Traceback (most recent call last):
+    ...
+    ValueError: Non-octal value was passed to the function
+    >>> oct_to_decimal("0")
+    0
+    >>> oct_to_decimal("-4055")
+    -2093
     >>> oct_to_decimal("2-0Fm")
     Traceback (most recent call last):
     ...
diff --git a/sorts/iterative_merge_sort.py b/sorts/iterative_merge_sort.py
index 5ee0badab..327974fa6 100644
--- a/sorts/iterative_merge_sort.py
+++ b/sorts/iterative_merge_sort.py
@@ -32,6 +32,22 @@ def iter_merge_sort(input_list: list) -> list:
 
     >>> iter_merge_sort([5, 9, 8, 7, 1, 2, 7])
     [1, 2, 5, 7, 7, 8, 9]
+    >>> iter_merge_sort([1])
+    [1]
+    >>> iter_merge_sort([2, 1])
+    [1, 2]
+    >>> iter_merge_sort([2, 1, 3])
+    [1, 2, 3]
+    >>> iter_merge_sort([4, 3, 2, 1])
+    [1, 2, 3, 4]
+    >>> iter_merge_sort([5, 4, 3, 2, 1])
+    [1, 2, 3, 4, 5]
+    >>> iter_merge_sort(['c', 'b', 'a'])
+    ['a', 'b', 'c']
+    >>> iter_merge_sort([0.3, 0.2, 0.1])
+    [0.1, 0.2, 0.3]
+    >>> iter_merge_sort(['dep', 'dang', 'trai'])
+    ['dang', 'dep', 'trai']
     >>> iter_merge_sort([6])
     [6]
     >>> iter_merge_sort([])
@@ -51,7 +67,7 @@ def iter_merge_sort(input_list: list) -> list:
 
     # iteration for two-way merging
     p = 2
-    while p < len(input_list):
+    while p <= len(input_list):
         # getting low, high and middle value for merge-sort of single list
         for i in range(0, len(input_list), p):
             low = i
@@ -62,6 +78,7 @@ def iter_merge_sort(input_list: list) -> list:
         if p * 2 >= len(input_list):
             mid = i
             input_list = merge(input_list, 0, mid, len(input_list) - 1)
+            break
         p *= 2
 
     return input_list
@@ -69,5 +86,8 @@ def iter_merge_sort(input_list: list) -> list:
 
 if __name__ == "__main__":
     user_input = input("Enter numbers separated by a comma:\n").strip()
-    unsorted = [int(item.strip()) for item in user_input.split(",")]
+    if user_input == "":
+        unsorted = []
+    else:
+        unsorted = [int(item.strip()) for item in user_input.split(",")]
     print(iter_merge_sort(unsorted))