Skip to content

UP my solution #115

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

Closed
Closed
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
21 changes: 11 additions & 10 deletions numpy_questions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Assignment - using numpy and making a PR.

The goals of this assignment are:
* Use numpy in practice with two easy exercises.
* Use automated tools to validate the code (`pytest` and `flake8`)
Expand All @@ -20,17 +19,14 @@

def max_index(X):
"""Return the index of the maximum in a numpy array.

Parameters
----------
X : ndarray of shape (n_samples, n_features)
The input array.

Returns
-------
(i, j) : tuple(int)
The row and columnd index of the maximum.

Raises
------
ValueError
Expand All @@ -39,29 +35,34 @@ def max_index(X):
"""
i = 0
j = 0

# TODO

# error handling
if not isinstance(X, np.ndarray):
raise ValueError("The input is not a numpy array")
if len(X.shape) != 2:
raise ValueError("The shape is not 2D")
i, j = np.unravel_index(np.argmax(X), X.shape)
return i, j


def wallis_product(n_terms):
"""Implement the Wallis product to compute an approximation of pi.

See:
https://en.wikipedia.org/wiki/Wallis_product

Parameters
----------
n_terms : int
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.
"""
# XXX : The n_terms is an int that corresponds to the number of
# terms in the product. For example 10000.
return 0.

product = 2.0
for i in range(1, n_terms + 1):
product *= (4 * i ** 2) / (4 * i ** 2 - 1)
return product
Loading