Skip to content

Commit 1eaf28c

Browse files
committed
Bugs fixed
1 parent 54918b0 commit 1eaf28c

1 file changed

Lines changed: 29 additions & 11 deletions

File tree

Week04/functions_tarik_bozgan.py

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
custom_power = lambda x=0, /, e=1: x**e
2-
"""lambda x=0 / e=1 → x**e"""
1+
custom_power = lambda x=0, e=1: x ** e
32

43

5-
def custom_equation(x: int = 0, y: int = 0, /, a: int = 1, b: int = 1, *, c: int = 1) -> float:
4+
def custom_equation(
5+
x: int = 0,
6+
y: int = 0,
7+
a: int = 1,
8+
b: int = 1,
9+
*,
10+
c: int = 1
11+
) -> float:
612
"""
7-
Calculates the result.
8-
:param x: Base number 1
9-
:param y: Base number 2
10-
:param a: Exponent for x
11-
:param b: Exponent for y
12-
:param c: Divisor
13-
:return: The calculated result as a float
13+
:param x: integer value
14+
:param y: integer value
15+
:param a: integer value
16+
:param b: integer value
17+
:param c: integer value
18+
:return: result of equation
1419
"""
15-
return (x**a + y**b) / c
20+
if not all(isinstance(v, int) for v in (x, y, a, b, c)):
21+
raise TypeError("All parameters must be int")
1622

23+
return (x ** a + y ** b) / c
24+
25+
<<<<<<< HEAD
1726
def fn_w_counter() -> tuple[int, dict[str, int]]:
1827
caller = __name__
1928

@@ -23,3 +32,12 @@ def fn_w_counter() -> tuple[int, dict[str, int]]:
2332
fn_w_counter.callers[caller] = fn_w_counter.callers.get(caller, 0) + 1
2433

2534
return fn_w_counter.total, fn_w_counter.callers.copy()
35+
=======
36+
37+
_call_count = 0
38+
39+
def fn_w_counter() -> (int, dict[str, int]):
40+
global _call_count
41+
_call_count += 1
42+
return _call_count, {__name__: _call_count}
43+
>>>>>>> 6d9c8062 (Bugs fixed)

0 commit comments

Comments
 (0)