Skip to content
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.

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

up my solution #205

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
42 changes: 25 additions & 17 deletions numpy_questions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

The goals of this assignment are:
* Use numpy in practice with two easy exercises.
* Use automated tools to validate the code (`pytest` and `flake8`)
* Submit a Pull-Request on github to practice `git`.
* Use automated tools to validate the code (pytest and flake8)
* Submit a Pull-Request on github to practice git.

The two functions below are skeleton functions. The docstrings explain what
are the inputs, the outputs and the expected error. Fill the function to
complete the assignment. The code should be able to pass the test that we
wrote. To run the tests, use `pytest test_numpy_question.py` at the root of
wrote. To run the tests, use pytest test_numpy_question.py at the root of
the repo. It should say that 2 tests ran with success.

We also ask to respect the pep8 convention: https://pep8.org.
This will be enforced with `flake8`. You can check that there is no flake8
errors by calling `flake8` at the root of the repo.
This will be enforced with flake8. You can check that there is no flake8
errors by calling flake8 at the root of the repo.
"""
import numpy as np

Expand All @@ -29,20 +29,21 @@ def max_index(X):
Returns
-------
(i, j) : tuple(int)
The row and columnd index of the maximum.
The row and column index of the maximum.

Raises
------
ValueError
If the input is not a numpy array or
if the shape is not 2D.
"""
i = 0
j = 0
if not isinstance(X, np.ndarray):
raise ValueError("Input must be a numpy array.")

# TODO

return i, j
if X.ndim != 2:
raise ValueError("Input array must be 2D.")
max_idx = np.unravel_index(np.argmax(X), X.shape)
return max_idx


def wallis_product(n_terms):
Expand All @@ -54,14 +55,21 @@ def wallis_product(n_terms):
Parameters
----------
n_terms : int
Number of steps in the Wallis product. Note that `n_terms=0` will
consider the product to be `1`.
Number of steps in the Wallis product. Note that n_terms=0 will
consider the product to be 1.

Returns
-------
pi : float
The approximation of order `n_terms` of pi using the Wallis product.
The approximation of order n_terms of pi using the Wallis product.
"""
# XXX : The n_terms is an int that corresponds to the number of
# terms in the product. For example 10000.
return 0.
if n_terms < 0:
raise ValueError("Number of terms must be non-negative.")
product = 1.0
for n in range(1, n_terms + 1):
numerator = 4 * n**2
denominator = (4 * n**2) - 1
product *= numerator / denominator

pi = product * 2
return pi