Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data_structures/hashing/hash_table_with_linked_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

def _set_value(self, key, data):
self.values[key] = deque([]) if self.values[key] is None else self.values[key]
self.values[key] = deque() if self.values[key] is None else self.values[key]
self.values[key].appendleft(data)
self._keys[key] = self.values[key]

Expand Down
2 changes: 1 addition & 1 deletion machine_learning/linear_discriminant_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def accuracy(actual_y: list, predicted_y: list) -> float:
num = TypeVar("num")


def valid_input(
def valid_input[num](
input_type: Callable[[object], num], # Usually float or int
input_msg: str,
err_msg: str,
Expand Down
99 changes: 99 additions & 0 deletions maths/area.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,32 @@ def surface_area_cone(radius: float, height: float) -> float:
return pi * radius * (radius + (height**2 + radius**2) ** 0.5)


def lateral_surface_cone(radius: float, height: float) -> float:
"""
Calculate the Lateral Surface Area of a Cone.
Wikipedia reference: https://en.wikipedia.org/wiki/Cone
Formula: pi * r * (h ** 2 + r ** 2) ** 0.5

>>> lateral_surface_cone(10, 20)
702.4814731040726
>>> lateral_surface_cone(6, 8)
188.49555921538757
>>> lateral_surface_cone(0, 0)
0.0
>>> lateral_surface_cone(1, -2)
Traceback (most recent call last):
...
ValueError: lateral_surface_cone() only accepts non-negative values
>>> lateral_surface_cone(-1, 2)
Traceback (most recent call last):
...
ValueError: lateral_surface_cone() only accepts non-negative values
"""
if radius < 0 or height < 0:
raise ValueError("lateral_surface_cone() only accepts non-negative values")
return pi * radius * (height**2 + radius**2) ** 0.5


def surface_area_conical_frustum(
radius_1: float, radius_2: float, height: float
) -> float:
Expand Down Expand Up @@ -202,6 +228,32 @@ def surface_area_cylinder(radius: float, height: float) -> float:
return 2 * pi * radius * (height + radius)


def lateral_surface_cylinder(radius: float, height: float) -> float:
"""
Calculate the Lateral Surface Area of a Cylinder.
Wikipedia reference: https://en.wikipedia.org/wiki/Cylinder
Formula: 2 * pi * r * h

>>> lateral_surface_cylinder(10, 20)
1256.6370614359173
>>> lateral_surface_cylinder(6, 8)
301.59289474462014
>>> lateral_surface_cylinder(0, 0)
0.0
>>> lateral_surface_cylinder(1, -2)
Traceback (most recent call last):
...
ValueError: lateral_surface_cylinder() only accepts non-negative values
>>> lateral_surface_cylinder(-1, 2)
Traceback (most recent call last):
...
ValueError: lateral_surface_cylinder() only accepts non-negative values
"""
if radius < 0 or height < 0:
raise ValueError("lateral_surface_cylinder() only accepts non-negative values")
return 2 * pi * radius * height


def surface_area_torus(torus_radius: float, tube_radius: float) -> float:
"""Calculate the Area of a Torus.
Wikipedia reference: https://en.wikipedia.org/wiki/Torus
Expand Down Expand Up @@ -555,6 +607,50 @@ def area_reg_polygon(sides: int, length: float) -> float:
return (sides * length**2) / (4 * tan(pi / sides))


def surface_area_reg_prism(sides: int, edge: float, height: float) -> float:
"""
Calculate the surface area of a regular prism.
Wikipedia reference: https://en.wikipedia.org/wiki/Prism
Formula: 2*S(base) + n*a*h

>>> surface_area_reg_prism(3, 10, 20)
686.6025403784439
>>> surface_area_reg_prism(4, 10, 10)
600.0
>>> surface_area_reg_prism(2, 10, 15)
Traceback (most recent call last):
...
ValueError: surface_area_reg_prism() only accepts integers greater than or equal \
to three as number of sides
>>> surface_area_reg_prism(5, -2, 3)
Traceback (most recent call last):
...
ValueError: surface_area_reg_prism() only accepts non-negative values as \
length of an edge or height
>>> surface_area_reg_prism(5, 2, -3)
Traceback (most recent call last):
...
ValueError: surface_area_reg_prism() only accepts non-negative values as \
length of an edge or height
>>> surface_area_reg_prism(2, -10, 15)
Traceback (most recent call last):
...
ValueError: surface_area_reg_prism() only accepts integers greater than or equal \
to three as number of sides
"""
if not isinstance(sides, int) or sides < 3:
raise ValueError(
"surface_area_reg_prism() only accepts integers greater than or \
equal to three as number of sides"
)
elif edge < 0 or height < 0:
raise ValueError(
"surface_area_reg_prism() only accepts non-negative values as \
length of an edge or height"
)
return 2 * area_reg_polygon(sides, edge) + sides * edge * height


if __name__ == "__main__":
import doctest

Expand All @@ -576,9 +672,12 @@ def area_reg_polygon(sides: int, length: float) -> float:
print(f"Sphere: {surface_area_sphere(20) = }")
print(f"Hemisphere: {surface_area_hemisphere(20) = }")
print(f"Cone: {surface_area_cone(10, 20) = }")
print(f"Cone, lateral: {lateral_surface_cone(10, 20) = }")
print(f"Conical Frustum: {surface_area_conical_frustum(10, 20, 30) = }")
print(f"Cylinder: {surface_area_cylinder(10, 20) = }")
print(f"Cylinder, lateral: {lateral_surface_cylinder(10, 20) = }")
print(f"Torus: {surface_area_torus(20, 10) = }")
print(f"Equilateral Triangle: {area_reg_polygon(3, 10) = }")
print(f"Square: {area_reg_polygon(4, 10) = }")
print(f"Reqular Pentagon: {area_reg_polygon(5, 10) = }")
print(f"Regular Pentagonal Prism: {surface_area_reg_prism(5, 10, 15) = }")
2 changes: 1 addition & 1 deletion searches/jump_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __lt__(self, other: Any, /) -> bool: ...
T = TypeVar("T", bound=Comparable)


def jump_search(arr: Sequence[T], item: T) -> int:
def jump_search[T: Comparable](arr: Sequence[T], item: T) -> int:
"""
Python implementation of the jump search algorithm.
Return the index if the `item` is found, otherwise return -1.
Expand Down