diff --git a/numpy_questions.py b/numpy_questions.py index 21fcec4b..bb6b439f 100644 --- a/numpy_questions.py +++ b/numpy_questions.py @@ -40,7 +40,13 @@ def max_index(X): i = 0 j = 0 - # TODO + if not isinstance(X, np.ndarray): + raise ValueError("Input is not a numpy array.") + + if X.ndim != 2: + raise ValueError("Input is not a 2D array") + + i, j = np.unravel_index(np.argmax(X), X.shape) return i, j @@ -62,6 +68,9 @@ def wallis_product(n_terms): 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. + if n_terms == 0: + return 1. + product = 1.0 + for n in range(1, n_terms + 1): + product *= (4 * n ** 2) / (4 * n ** 2 - 1) + return 2. * product diff --git a/sklearn_questions.py b/sklearn_questions.py index 948c2e54..ea11a757 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -17,7 +17,6 @@ Finally, you need to write docstring similar to the one in `numpy_questions` for the methods you code and for the class. The docstring will be checked using -`pydocstyle` that you can also call at the root of the repo. """ import numpy as np from sklearn.base import BaseEstimator @@ -25,51 +24,79 @@ from sklearn.utils.validation import check_X_y from sklearn.utils.validation import check_array from sklearn.utils.validation import check_is_fitted -from sklearn.utils.validation import validate_data from sklearn.utils.multiclass import check_classification_targets class OneNearestNeighbor(ClassifierMixin, BaseEstimator): - "OneNearestNeighbor classifier." + """OneNearestNeighbor classifier.""" def __init__(self): # noqa: D107 pass def fit(self, X, y): - """Write docstring. - - And describe parameters + """Fit the classifier by storing the training data. + + Parameters + ---------- + X : ndarray of shape (n_samples, n_features) + The training data. + y : ndarray of shape (n_samples,) + The training labels. + + Returns + ------- + self : OneNearestNeighbor + The fitted estimator. """ X, y = check_X_y(X, y) check_classification_targets(y) self.classes_ = np.unique(y) self.n_features_in_ = X.shape[1] - - # XXX fix + self.X_ = X + self.y_ = y return self def predict(self, X): - """Write docstring. + """Predict the label of each sample with its nearest neighbor. + + Parameters + ---------- + X : ndarray of shape (n_samples, n_features) + The samples to classify. - And describe parameters + Returns + ------- + y_pred : ndarray of shape (n_samples,) + The predicted labels. """ check_is_fitted(self) X = check_array(X) - y_pred = np.full( - shape=len(X), fill_value=self.classes_[0], - dtype=self.classes_.dtype + if X.shape[1] != self.n_features_in_: + raise ValueError( + f"X has {X.shape[1]} features, but OneNearestNeighbor is " + f"expecting {self.n_features_in_} features as input" + ) + distances = np.linalg.norm( + X[:, np.newaxis, :] - self.X_[np.newaxis, :, :], axis=2 ) - - # XXX fix - return y_pred + nearest = np.argmin(distances, axis=1) + return self.y_[nearest] def score(self, X, y): - """Write docstring. - - And describe parameters + """Return the accuracy of the classifier. + + Parameters + ---------- + X : ndarray of shape (n_samples, n_features) + The samples to classify. + y : ndarray of shape (n_samples,) + The true labels. + + Returns + ------- + score : float + The fraction of correctly classified samples. """ X, y = check_X_y(X, y) y_pred = self.predict(X) - - # XXX fix - return y_pred.sum() + return np.mean(y_pred == y)