Abdelilah_Nossair

numpy_questions.py

@@ -37,11 +37,15 @@ def max_index(X):
         If the input is not a numpy array or
         if the shape is not 2D.
     """
-    i = 0
-    j = 0
+    if not isinstance(X, np.ndarray):
+        raise ValueError("The input is not a NumPy Array")
 
-    # TODO
+    if X.ndim != 2:
+        raise ValueError("The shape of the iput is not 2D")
 
+    index = np.argmax(X)  # Get the flattened index of the maimum in the array
+    i = index // X.shape[1]  # Get the row number of the maximum
+    j = index % X.shape[1]  # Get the column number of the max
     return i, j
 
 
@@ -64,4 +68,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.
+    pi_2 = 1
+    if n_terms == 0:
+        return pi_2
+
+    for i in range(1, n_terms+1):
+        pi_2 = pi_2 * (4*i**2)/(4*i**2-1)
+
+    return pi_2*2

sklearn_questions.py

@@ -23,53 +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_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
+        """Store training observations and their labels.
+
+        Parameters
+        ----------
+        X : np.ndarray
+            2D array of training features of shape (n_samples, n_features)
+        y : np.ndarray
+            1D array of training labels of shape (n_samples,)
+
+        Returns
+        -------
+        self : OneNearestNeighbor object
+            Fitted model storing training data
         """
-        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 label of the nearest training point.
 
-        And describe parameters
+        Parameters
+        ----------
+        X : np.ndarray
+            2D array of obs to classify of shape (n_samples, n_features)
+
+        Returns
+        -------
+        y_pred : ndarray of shape (n_samples,)
+            Predicted label for each observation.
         """
-        check_is_fitted(self)
-        X = check_array(X)
+        check_is_fitted(self)  # Raise NotFittedError
+        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, x in enumerate(X):
+            dists = np.linalg.norm(self.X_train_ - x, axis=1)
+            nearest_index = np.argmin(dists)
+            y_pred[i] = self.y_train_[nearest_index]
+
         return y_pred
 
     def score(self, X, y):
-        """Write docstring.
-
-        And describe parameters
+        """Compute the mean accuracy of the classification.
+
+        Parameters
+        ----------
+        X : np.ndarray
+            2D array of samples to evaluate of shape (n_samples, n_features)
+        y : np.ndarray
+            1D array of true labels of shape (n_samples,)
+
+        Returns
+        -------
+        accuracy : float
+            Proportion of correctly classified samples over all 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)