From 496f57d3db31ae564f8967e74ebb8c1f6707afde Mon Sep 17 00:00:00 2001 From: Anna Troppina Date: Tue, 10 Nov 2026 16:16:52 +0100 Subject: [PATCH 1/2] Complete Python assignment --- numpy_questions.py | 14 ++++++--- sklearn_questions.py | 70 ++++++++++++++++++++++++++++++++------------ 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/numpy_questions.py b/numpy_questions.py index 21fcec4b..d2f24733 100644 --- a/numpy_questions.py +++ b/numpy_questions.py @@ -40,7 +40,10 @@ def max_index(X): i = 0 j = 0 - # TODO + if not isinstance(X, np.ndarray) or X.ndim != 2: + raise ValueError("X must be a 2D NumPy array") + + i, j = np.unravel_index(np.argmax(X), X.shape) return i, j @@ -62,6 +65,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: + pi = 1 + else: + n = np.arange(1, n_terms + 1) + pi = 2 * np.prod((4 * n**2)/(4 * n**2 - 1)) + return pi diff --git a/sklearn_questions.py b/sklearn_questions.py index f65038c6..cfc17edb 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -23,52 +23,86 @@ from sklearn.base import BaseEstimator from sklearn.base import ClassifierMixin 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.multiclass import check_classification_targets +from sklearn.utils.validation import validate_data -class OneNearestNeighbor(BaseEstimator, ClassifierMixin): - "OneNearestNeighbor classifier." +class OneNearestNeighbor(ClassifierMixin, BaseEstimator): + """OneNearestNeighbor classifier.""" def __init__(self): # noqa: D107 pass def fit(self, X, y): - """Write docstring. - - And describe parameters + """Fit the classifier using the training data. + + Parameters + ---------- + X : array-like + Training data + y : array-like + Training labels + + Returns + ------- + self : OneNearestNeighbor + The fitted classifier """ - X, y = check_X_y(X, y) + X, y = validate_data(self, 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 labels using the nearest training neighbor. + + Parameters + ---------- + X : array-like + Data to classify - And describe parameters + Returns + ------- + y_pred : ndarray + Predicted labels """ check_is_fitted(self) - X = check_array(X) + + X = validate_data(self, X, reset=False) y_pred = np.full( shape=len(X), fill_value=self.classes_[0], dtype=self.classes_.dtype ) - - # XXX fix + for i in range(len(X)): + dist = np.linalg.norm(X[i] - self.X_train_, axis=1) + idx_min = np.argmin(dist) + y_pred[i] = self.y_train_[idx_min] return y_pred def score(self, X, y): - """Write docstring. - - And describe parameters + """Compute the classification accuracy. + + Parameters + ---------- + X : array-like + Data to classify + y : array-like + True labels + + Returns + ------- + accuracy : float + Proportion of correctly classified samples """ X, y = check_X_y(X, y) y_pred = self.predict(X) - # XXX fix - return y_pred.sum() + accuracy = np.mean(y_pred == y) + + return accuracy From 596a63a15f32b75add95b503c4278283d9bd87b3 Mon Sep 17 00:00:00 2001 From: Anna Troppina Date: Tue, 10 Nov 2026 16:31:38 +0100 Subject: [PATCH 2/2] unused import --- sklearn_questions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sklearn_questions.py b/sklearn_questions.py index 77d19499..4f5ea6d1 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -26,7 +26,6 @@ from sklearn.utils.validation import check_is_fitted from sklearn.utils.validation import validate_data from sklearn.utils.multiclass import check_classification_targets -from sklearn.utils.validation import validate_data class OneNearestNeighbor(ClassifierMixin, BaseEstimator):