From 2b244297ceeb55c974627fbee00bf5cf41e1d34e Mon Sep 17 00:00:00 2001 From: Simon Konieczny Date: Tue, 10 Nov 2026 14:27:56 +0100 Subject: [PATCH 1/4] implemented questions --- numpy_questions.py | 15 +++++++++------ sklearn_questions.py | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/numpy_questions.py b/numpy_questions.py index 21fcec4b..cefd7cbe 100644 --- a/numpy_questions.py +++ b/numpy_questions.py @@ -37,10 +37,13 @@ def max_index(X): If the input is not a numpy array or if the shape is not 2D. """ - i = 0 - j = 0 + if type(X) is not np.ndarray: + raise ValueError("Input is not a numpy array") - # TODO + if X.ndim != 2: + raise ValueError(f"Input is not 2D: {X.ndim}") + + i, j = np.unravel_index(np.argmax(X), X.shape) return i, j @@ -62,6 +65,6 @@ 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. + x = np.arange(1, n_terms+1) + + return 1 if n_terms == 0 else 2 * np.prod((4 * x**2) / (4 * x**2 - 1)) diff --git a/sklearn_questions.py b/sklearn_questions.py index f65038c6..5bd652dd 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -23,52 +23,63 @@ 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 validate_data from sklearn.utils.validation import check_is_fitted from sklearn.utils.multiclass import check_classification_targets -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. + """Fit the OneNearestNeighbor model from the training dataset. + + Parameters: + X: train features + y: train labels - And describe parameters + Returns + self: the fitted instance """ - 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 the class labels for the provided data. - And describe parameters + Parameters: + X: features to predict """ check_is_fitted(self) - X = check_array(X) + X = validate_data(self, X=X, reset=False) y_pred = np.full( shape=len(X), fill_value=self.classes_[0], dtype=self.classes_.dtype ) - # XXX fix + for i, x in enumerate(X): + distances = np.linalg.norm(self.X_train_ - x, axis=1) + closest_idx = np.argmin(distances) + y_pred[i] = self.y_train_[closest_idx] + return y_pred - def score(self, X, y): + def score(self, X, y, sample_weight=None): """Write docstring. - And describe parameters + Parameters: + X: """ X, y = check_X_y(X, y) y_pred = self.predict(X) - # XXX fix - return y_pred.sum() + return np.mean(y_pred == y) From dfc093b78117ac0ce86c01a6bc0583018cfc280b Mon Sep 17 00:00:00 2001 From: Simon Konieczny Date: Tue, 10 Nov 2026 14:36:17 +0100 Subject: [PATCH 2/4] Increment Python version on the jobs --- .github/workflows/python-app.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 70820ef0..9e02f1d7 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -29,10 +29,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | pip install flake8 pydocstyle From 2a762e83d303ee05cf19051303d886b64f841027 Mon Sep 17 00:00:00 2001 From: Simon Konieczny Date: Tue, 10 Nov 2026 14:37:44 +0100 Subject: [PATCH 3/4] Revert "Increment Python version on the jobs" This reverts commit dfc093b78117ac0ce86c01a6bc0583018cfc280b. --- .github/workflows/python-app.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 9e02f1d7..70820ef0 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.11 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.8 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -29,10 +29,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.11 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.8 - name: Install dependencies run: | pip install flake8 pydocstyle From 9f508a4fdc16f71d9368514588aa71922691e5b7 Mon Sep 17 00:00:00 2001 From: Simon Konieczny Date: Tue, 10 Nov 2026 14:55:45 +0100 Subject: [PATCH 4/4] Fix the docstrings --- sklearn_questions.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sklearn_questions.py b/sklearn_questions.py index 5bd652dd..e05e9eac 100644 --- a/sklearn_questions.py +++ b/sklearn_questions.py @@ -38,11 +38,11 @@ def fit(self, X, y): """Fit the OneNearestNeighbor model from the training dataset. Parameters: - X: train features - y: train labels + X: array-like of shape (n_samples, n_features) + y: array-like of shape (n_samples,) Returns - self: the fitted instance + self: the fitted instance of OneNearestNeighbor """ X, y = validate_data(self, X, y) check_classification_targets(y) @@ -57,7 +57,10 @@ def predict(self, X): """Predict the class labels for the provided data. Parameters: - X: features to predict + X: array-like of shape (n_samples, n_features) + + Returns + y_pred: array-like of shape (n_samples,) """ check_is_fitted(self) X = validate_data(self, X=X, reset=False) @@ -74,10 +77,15 @@ def predict(self, X): return y_pred def score(self, X, y, sample_weight=None): - """Write docstring. + """Return the mean accuracy on the given test data and labels. Parameters: - X: + X: array-like of shape (n_samples, n_features) + y: array-like of shape (n_samples,) + sample_weight: not used + + Returns + Mean accuracy of self.predit(X) """ X, y = check_X_y(X, y) y_pred = self.predict(X)