Merge branch 'master' of https://github.com/CatalinAnt/algorithms-SEP-95

Author: aymanpopje

README.md

@@ -23,19 +23,92 @@ In order to not put in 8 large images, I will insert the final screenshot, with
 
 ### Your own coverage tool
 
-<The following is supposed to be repeated for each group member>
+#### Ayman Errahmouni
 
-<Group member name>
+##### Function 1: simplify_path_v2
+
+[Link the commit](https://github.com/CatalinAnt/algorithms-SEP-95/pull/2/commits/22ee6fa1df4785596c603af61a725c558973eb0b)
+
+Screenshot of branch measurement (66%):<br>
+![image](image-7.png)
+
+##### Function 2: insertion_sort
+
+[Link to commit](https://github.com/CatalinAnt/algorithms-SEP-95/pull/2/commits/5dae7f28036f89b7f6ff673639a922dd714aff3e)
+
+Screenshot of branch measurement (0%, was untested):<br>
+![alt text](image-8.png)
+
+#### Catalin Antonescu
+
+##### Function 1: strong_password
+ 
+Link to commit:
+[https://github.com/CatalinAnt/algorithms-SEP-95/commit/eaad6d32ecd73bb8fde876a4d4852cb522aea6f8](https://github.com/CatalinAnt/algorithms-SEP-95/commit/2b0b9187c1c040e4476b1ca14f2c2249273566b7)
+
+Screenshot of branch measurement:
+![image](https://github.com/CatalinAnt/algorithms-SEP-95/assets/113595149/e718a47f-5ea0-412c-b250-25a193412164)
+
+##### Function 2: rotate_image
+
+Link to commit:(same as for the first one)
+[https://github.com/CatalinAnt/algorithms-SEP-95/commit/eaad6d32ecd73bb8fde876a4d4852cb522aea6f8](https://github.com/CatalinAnt/algorithms-SEP-95/commit/2b0b9187c1c040e4476b1ca14f2c2249273566b7)
+
+Screenshot of branch measurement:
+![image](https://github.com/CatalinAnt/algorithms-SEP-95/assets/113595149/94eec9b6-3dd6-46e3-b087-40892eccc10e)
+
+#### Abdullah Abdelkhalik
 
-<Function 1 name>
 
-<Show a patch (diff) or a link to a commit made in your forked repository that shows the instrumented code to gather coverage measurements>
+pythagoras
+
+https://github.com/CatalinAnt/algorithms-SEP-95/commit/5651abafebe8ae3a5ea63e74883bb991acf19303
 
-<Provide a screenshot of the coverage results output by the instrumentation>
+![pythagoras_hits](https://github.com/CatalinAnt/algorithms-SEP-95/assets/114078193/0df1fa2b-2185-4b9f-ae65-5d969edb009b)
 
-<Function 2 name>
 
-<Provide the same kind of information provided for Function 1>
+first_unique_char
+
+https://github.com/CatalinAnt/algorithms-SEP-95/commit/c16f26e952322b2c1729778a4141a57103ba7658
+
+![first_unique_char_hits](https://github.com/CatalinAnt/algorithms-SEP-95/assets/114078193/10d7c45c-398e-4408-8f11-6771f51fa95c)
+
+
+#### Abdullah Abdelkhalik
+
+
+pythagoras
+
+https://github.com/CatalinAnt/algorithms-SEP-95/commit/5651abafebe8ae3a5ea63e74883bb991acf19303
+
+![pythagoras_hits](https://github.com/CatalinAnt/algorithms-SEP-95/assets/114078193/0df1fa2b-2185-4b9f-ae65-5d969edb009b)
+
+
+first_unique_char
+
+https://github.com/CatalinAnt/algorithms-SEP-95/commit/c16f26e952322b2c1729778a4141a57103ba7658
+
+![first_unique_char_hits](https://github.com/CatalinAnt/algorithms-SEP-95/assets/114078193/10d7c45c-398e-4408-8f11-6771f51fa95c)
+
+
+#### Almuthana Almustafa
+
+##### Function 1: stoogsort in stoog_sort.py
+
+[Link to the commit in the founction files](https://github.com/CatalinAnt/algorithms-SEP-95/commit/57b66879c6ae0f82712c55528f540dfdb3c3ddd3)
+
+result: 
+
+![alt text](result_image-2.png)
+
+##### Function 2: word_break in word_break.py
+
+link to commit in founction:
+[Link to the commit in the founction files](https://github.com/CatalinAnt/algorithms-SEP-95/commit/57b66879c6ae0f82712c55528f540dfdb3c3ddd3 )
+
+result:
+
+![alt text](result_image_2.png)
 
 #### Ayman Errahmouni
 
@@ -191,7 +264,6 @@ New coverage:
 
 For strong_password there was a 26% coverage improvement with the existing tool and 40% with manual measurement tool.
 
-
 Test 2:
 
 In test_matrix:
@@ -233,6 +305,38 @@ https://github.com/CatalinAnt/algorithms-SEP-95/commit/5651abafebe8ae3a5ea63e748
 
 The coverage is improved by 13%, the code only hit three out of five branches and only set up two examples. I added a case where there is no unique letter.
 
+## Almuthana Almustafa
+
+### Test 1: stoogsort
+
+
+
+link to commit in test files:
+[Link to the commit in the test files](https://github.com/CatalinAnt/algorithms-SEP-95/commit/157de36fd4c373b67cd03e3b3713be9ba5cf0d97)
+
+existing tool result before:
+
+![alt text](stoog_sort_image1.png)
+
+existing tool result after:
+
+![alt text](stoog_sort_image2.png)
+
+The coverage increased by 89%, largely attributable to the implementation of new tests.
+
+### Test 2: word_break
+
+[Link to the commit in the test files](https://github.com/CatalinAnt/algorithms-SEP-95/commit/157de36fd4c373b67cd03e3b3713be9ba5cf0d97)
+
+existing tool result before:
+
+![alt text](word_break_image1.png)
+
+existing tool result after:
+
+![alt text](word_break_image2.png)
+
+The coverage improved by 86% due to the creation of new tests.
 
 ### Overall
 
@@ -252,3 +356,5 @@ Due to the large size of the project, the percentage only went up by one percent
 <Write what each group member did>
 
 Abdullah -> increased the coverage for two functions.
+Almuthana Almustafa -> Instrumentation was added to two functions, and test cases were created for them to improve coverage.
+

algorithms/dp/word_break.py

@@ -17,6 +17,14 @@
 """
 
 
+# TC: O(N^2)  SC: O(N)
+branch_coverage = {
+    "check_5": False,  
+    "check_6": False,   
+    "check_7": False,
+    "check_8": False,
+    
+}
 # TC: O(N^2)  SC: O(N)
 def word_break(word, word_dict):
     """
@@ -27,15 +35,29 @@ def word_break(word, word_dict):
     dp_array = [False] * (len(word)+1)
     dp_array[0] = True
     for i in range(1, len(word)+1):
+        branch_coverage["check_5"] = True
         for j in range(0, i):
+            branch_coverage["check_6"] = True
             if dp_array[j] and word[j:i] in word_dict:
+                branch_coverage["check_7"] = True
                 dp_array[i] = True
                 break
+            branch_coverage["check_8"] = True
     return dp_array[-1]
 
 
-if __name__ == "__main__":
-    STR = "keonkim"
-    dic = ["keon", "kim"]
+def print_coverage():
+    total = len(branch_coverage)
+    reached = sum(branch_coverage.values())
+    coverage_percentage = (reached / total) * 100
+    for branch, hit in branch_coverage.items():
+        print(f"{branch} was {'hit' if hit else 'not hit'}")
+    print(f"coverage_percentage: {coverage_percentage}%")
+
+
+result = word_break("keonkim", {"keon", "kim"})
+print_coverage()
+
+
+
 
-    print(word_break(str, dic))

algorithms/sort/stooge_sort.py

@@ -6,22 +6,30 @@
 
 '''
 
-
+branch_coverage = {
+    "check_1": False,  # if branch for x > 0
+    "check_2": False,   # else branch
+    "check_3": False,
+    "check_4": False,
+}
 
 def stoogesort(arr, l, h): 
     if l >= h: 
+        branch_coverage["check_1"] = True
         return
 
     # If first element is smaller 
     # than last, swap them 
     if arr[l]>arr[h]: 
+        branch_coverage["check_2"] = True
         t = arr[l] 
         arr[l] = arr[h] 
         arr[h] = t 
 
     # If there are more than 2 elements in 
     # the array 
     if h-l + 1 > 2: 
+        branch_coverage["check_3"] = True
         t = (int)((h-l + 1)/3) 
 
         # Recursively sort first 2 / 3 elements 
@@ -33,11 +41,27 @@ def stoogesort(arr, l, h):
         # Recursively sort first 2 / 3 elements 
         # again to confirm 
         stoogesort(arr, l, (h-t)) 
+
+    branch_coverage["check_4"] = True
+
+def print_coverage():
+    total = len(branch_coverage)
+    reached = sum(branch_coverage.values())
+    coverage_percentage = (reached / total) * 100 
+    for branch, hit in branch_coverage.items():
+        print(f"{branch} was {'hit' if hit else 'not hit'}")
+    print(f"coverage_percentage: {coverage_percentage}%")
+
+arr1 = [10, -1, 2, 3, 0]
+arr2 = []
+result = stoogesort(arr1, 0, len(arr1) - 1)
+result = stoogesort(arr1, 0, len(arr2) - 1)
+print_coverage()
 
 
-if __name__ == "__main__":
-    array = [1,3,64,5,7,8]
-    n = len(array) 
-    stoogesort(array, 0, n-1) 
-    for i in range(0, n): 
-        print(array[i], end = ' ') 
+# if __name__ == "__main__":
+#     array = [1,3,64,5,7,8]
+#     n = len(array) 
+#     stoogesort(array, 0, n-1) 
+#     for i in range(0, n): 
+#         print(array[i], end = ' ') 

result_image-2.png

@@ -14,7 +14,8 @@
     longest_increasing_subsequence_optimized,
     longest_increasing_subsequence_optimized2,
     int_divide,find_k_factor,
-    planting_trees, regex_matching
+    planting_trees, regex_matching,
+    word_break,
 )
 
 
@@ -258,6 +259,16 @@ def test_symbol_2(self):
         p = "ab*"
         self.assertTrue(regex_matching.is_match(s, p))
 
+class TestWordBreak(unittest.TestCase):
+    """Test for interpolation_search and word_break"""
+
+    def test_word_break(self):
+        self.assertTrue(word_break("keonkim", {"keon", "kim"}))
+        self.assertTrue(word_break("leetcode", {"leet", "code"}))
+        self.assertFalse(word_break("catsandog", {"cats", "dog", "sand", "and", "cat"}))
+        self.assertTrue(word_break("applepenapple", {"apple", "pen"}))
+        self.assertFalse(word_break("pineapplepenapple", {"apple", "pen"}))
+        self.assertTrue(word_break("aaaaaaa", {"aaaa", "aaa"}))
 
 if __name__ == '__main__':
     unittest.main()

result_image_2.png

@@ -17,7 +17,8 @@
     radix_sort,
     gnome_sort,
     cocktail_shaker_sort,
-    top_sort, top_sort_recursive
+    top_sort, top_sort_recursive,
+    stoogesort
 )
 
 import unittest
@@ -124,7 +125,27 @@ def test_topsort(self):
         self.assertTrue(res.index('g') < res.index('e'))
         res = top_sort(self.depGraph)
         self.assertTrue(res.index('g') < res.index('e'))
-
+class TestStoog(unittest.TestCase):
+    def test_stoogesort(self):
+        arr1 = [1, 3, 64, 5, 7, 8]
+        stoogesort(arr1, 0, len(arr1) - 1)
+        self.assertEqual(arr1, [1, 3, 5, 7, 8, 64])
+
+        arr2 = [5, 4, 3, 2, 1]
+        stoogesort(arr2, 0, len(arr2) - 1)
+        self.assertEqual(arr2, [1, 2, 3, 4, 5])
+
+        arr3 = [1, 2, 3, 4, 5]
+        stoogesort(arr3, 0, len(arr3) - 1)
+        self.assertEqual(arr3, [1, 2, 3, 4, 5])
+
+        arr4 = [10, -1, 2, 3, 0]
+        stoogesort(arr4, 0, len(arr4) - 1)
+        self.assertEqual(arr4, [-1, 0, 2, 3, 10])
+
+        arr5 = []
+        stoogesort(arr5, 0, len(arr5) - 1)
+        self.assertEqual(arr5, [])
 
 if __name__ == "__main__":
     unittest.main()