diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b2a4f1..64580a7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/test.iml b/.idea/test.iml
index 4fb462c..89b2bd1 100644
--- a/.idea/test.iml
+++ b/.idea/test.iml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/Project 2/Card.py b/Project 2/Card.py
index e972c1a..eb9aff9 100644
--- a/Project 2/Card.py
+++ b/Project 2/Card.py
@@ -31,6 +31,8 @@ class Card:
def __add__(self, other) -> int:
#Adding 2 cards together
+
+ return "Cat"
if isinstance(other, Card):
return self._value + other._value
elif isinstance(other, int):
diff --git a/Project 2/__pycache__/Card.cpython-314.pyc b/Project 2/__pycache__/Card.cpython-314.pyc
index 0e090c1..e3bb997 100644
Binary files a/Project 2/__pycache__/Card.cpython-314.pyc and b/Project 2/__pycache__/Card.cpython-314.pyc differ
diff --git a/Project 2/utilities.py b/Project 2/utilities.py
index fe6cd15..f087445 100644
--- a/Project 2/utilities.py
+++ b/Project 2/utilities.py
@@ -39,7 +39,8 @@ def test_sum_cards():
Card("spade", 12),
Card("clubs", 1)
]
- assert sum_cards_iter(cards) == 21
- assert sum_cards_recursive(cards) == 21
+ print(sum_cards_iter(cards))
+ # assert sum_cards_iter(cards) == 21
+ # assert sum_cards_recursive(cards) == 21
test_sum_cards()
\ No newline at end of file
diff --git a/Project 3/__pycache__/project_3_search.cpython-314.pyc b/Project 3/__pycache__/project_3_search.cpython-314.pyc
new file mode 100644
index 0000000..34af1a6
Binary files /dev/null and b/Project 3/__pycache__/project_3_search.cpython-314.pyc differ
diff --git a/Project 3/project_3_search.py b/Project 3/project_3_search.py
index 768d320..adc8d7b 100644
--- a/Project 3/project_3_search.py
+++ b/Project 3/project_3_search.py
@@ -9,6 +9,7 @@
import random #to generate the 100 random values
import time #for part 4, to calculae total time
+from collections.abc import Sequence
#I decided to put all 4 functions into one class to keep it organized
class Search:
@@ -16,8 +17,8 @@ class Search:
"""
This function generates the list of random integers.
"""
- def generate_random_list(self, n):
- array = [] #array starts as blank
+ def generate_random_list(self, n: int) -> list[int]:
+ array: list[int] = [] #array starts as blank
for element in range(n): #will run n times
array.append(random.randint(0, 1000)) #random integer between 0-1000
@@ -30,7 +31,7 @@ class Search:
"""
This funciton preforms a search on the list for the target value, and prints the number of checks it took to find the target.
"""
- def linear_search_print(self, arr, target):
+ def linear_search_print(self, arr: Sequence[int], target: int) -> int:
checks = 0 #check count starts at 0
for value in arr:
if value == target:
@@ -44,7 +45,7 @@ class Search:
"""
This function is the same as the previous one, but instead of printing the number of checks, it returns the number of checks.
"""
- def linear_search_count(self, arr, target):
+ def linear_search_count(self, arr: Sequence[int], target: int) -> int:
checks = 0
for value in arr:
checks += 1
@@ -55,7 +56,13 @@ class Search:
"""
This function uses recursive searching.
"""
- def binary_search_recursive(self, arr, target, low, high):
+ def binary_search_recursive(
+ self,
+ arr: Sequence[int],
+ target: int,
+ low: int,
+ high: int,
+ ) -> int:
if low > high:
return -1 #base case: if low is greater than high, the target is not found
@@ -68,7 +75,7 @@ class Search:
else:
return self.binary_search_recursive(arr, target, low, mid - 1)
-def main():
+def main() -> None:
search = Search() #search object to call Search() class
"""
@@ -132,4 +139,4 @@ def main():
# only execute when you run this file directily
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()