Skip to content

Updates in lecture #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acse-yz3521 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updates in lecture #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3af4f2
Add factorial function.
acse-yz3521 Oct 25, 2021
72f0ca7
Add new function for pi.
acse-yz3521 Oct 25, 2021
78ae10a
Update python version + flake8.
acse-yz3521 Oct 26, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/pytest-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Checkout simple_functions
uses: actions/checkout@v2

- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.9

- name: Install dependencies
run: |
Expand Down
1 change: 1 addition & 0 deletions simple_functions/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .functions1 import * # noqa
from .constants import * # noqa

from pkg_resources import get_distribution, DistributionNotFound
try:
Expand Down
15 changes: 15 additions & 0 deletions simple_functions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from numpy import sqrt
from simple_functions.functions1 import factorial
from functools import cache

__all__ = ['pi']


def pi(terms=1):
return 1./(2.*sqrt(2.)/9801.*rsum(terms))


@cache
def rsum(n):
t = factorial(4*n)*(1103+26390*n)/(factorial(n)**4*396**(4*n))
return t + rsum(n-1) if n else t
9 changes: 8 additions & 1 deletion simple_functions/functions1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@

__all__ = ['my_sum']
from functools import cache

__all__ = ['my_sum','factorial']


def my_sum(iterable):
tot = 0
for i in iterable:
tot += i
return tot


@cache
def factorial(n):
return n * factorial(n-1) if n else 1
13 changes: 13 additions & 0 deletions tests/test_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import numpy as np

from simple_functions import pi


class TestPi(object):
'''Class to test our constants are computed correctly'''


def test_pi(self):
'''Test computation of pi'''
my_pi = pi(2)
assert np.isclose(my_pi, np.pi, atol=1e-12)
13 changes: 12 additions & 1 deletion tests/test_simple_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest

from simple_functions import my_sum
from simple_functions import my_sum, factorial


class TestSimpleFunctions(object):
Expand All @@ -14,3 +14,14 @@ def test_my_add(self, iterable, expected):
'''Test our add function'''
isum = my_sum(iterable)
assert isum == expected


@pytest.mark.parametrize('number, expected', [
(5, 120),
(3, 6),
(1, 1)
])
def test_factorial(self, number, expected):
'''Test our factorial function'''
answer = factorial(number)
assert answer == expected