diff --git a/numpy_questions.py b/numpy_questions.py index 21fcec4b..fa6eca04 100644 --- a/numpy_questions.py +++ b/numpy_questions.py @@ -41,6 +41,13 @@ def max_index(X): j = 0 # TODO + if not isinstance(X, np.ndarray): + raise ValueError("X must be a numpy array") + if len(X.shape) != 2: + raise ValueError + + flatten_index = np.argmax(X) + i, j = np.unravel_index(flatten_index, np.shape(X)) return i, j @@ -64,4 +71,11 @@ def wallis_product(n_terms): """ # 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 + + pi2 = 1 + for i in range(1, n_terms + 1): + pi2 = (4 * i**2) / ((4 * i**2) - 1) * pi2 + pi = 2 * pi2 + return pi diff --git a/sklearn_questions.py b/sklearn_questions.py index 948c2e54..7f773fcb 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -25,33 +25,65 @@ 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. + + For each sample, predict the label of the closest training sample, + using the Euclidean distance. + + Attributes + ---------- + classes_ : ndarray of shape (n_classes,) + The class labels seen during fit. + n_features_in_ : int + The number of features seen during fit. + """ 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 samples. + y : ndarray of shape (n_samples,) + The target labels of the training samples. + + Returns + ------- + self : OneNearestNeighbor + The fitted classifier. """ 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_train_ = X + self.y_train_ = y return self def predict(self, X): - """Write docstring. + """Predict the label of each sample in X. + + The predicted label is the label of the closest training sample, + using the Euclidean distance. - And describe parameters + Parameters + ---------- + X : ndarray of shape (n_samples, n_features) + The samples to classify. + + Returns + ------- + y_pred : ndarray of shape (n_samples,) + The predicted label for each sample. """ check_is_fitted(self) X = check_array(X) @@ -60,16 +92,36 @@ def predict(self, X): dtype=self.classes_.dtype ) - # XXX fix + if X.shape[1] != self.n_features_in_: + raise ValueError( + f"X has {X.shape[1]} features, but OneNearestNeighbor " + f"is expecting {self.n_features_in_} features as input" + ) + + i = 0 + for x in X: + distance = np.linalg.norm(self.X_train_ - x, axis=1) + y_pred[i] = self.y_train_[np.argmin(distance)] + i += 1 return y_pred def score(self, X, y): - """Write docstring. - - And describe parameters + """Return the accuracy of the classifier on the given data. + + Parameters + ---------- + X : ndarray of shape (n_samples, n_features) + The test samples. + y : ndarray of shape (n_samples,) + The true labels of the test samples. + + Returns + ------- + score : float + The fraction of samples in X that are correctly classified. """ X, y = check_X_y(X, y) - y_pred = self.predict(X) - # XXX fix - return y_pred.sum() + y_pred = self.predict(X) + accuracy = np.mean(y_pred == y) + return accuracy