Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions hiclass/HierarchicalClassifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import networkx as nx
import numpy as np
import sklearn

from joblib import Parallel, delayed
from sklearn.base import BaseEstimator
from sklearn.linear_model import LogisticRegression
Expand Down Expand Up @@ -348,3 +350,12 @@ def _clean_up(self):
del self.y_
if self.sample_weight_ is not None:
del self.sample_weight_

def _change_local_classifier(self, classifier):
if not isinstance(classifier, sklearn.base.BaseEstimator):
raise TypeError(
"Unsupported Classifier: Classifier should be of type sklearn.base.BaseEstimator"
)

self.local_classifier = classifier
self.local_classifier_ = classifier
15 changes: 14 additions & 1 deletion tests/test_LocalClassifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def test_knn(classifier):
@pytest.mark.parametrize("classifier", classifiers)
def test_fit_multiple_dim_input(classifier):
clf = classifier()
X = np.random.rand(1, 275, 3)
X = np.random.rand(1, 1, 275, 3)
y = np.array([["a", "b", "c"]])
clf.fit(X, y)
check_is_fitted(clf)
Expand All @@ -119,3 +119,16 @@ def test_predict_multiple_dim_input(classifier):
clf.fit(X, y)
predictions = clf.predict(X)
assert predictions is not None


@pytest.mark.parametrize("classifier", classifiers)
def test_change_local_classifier(classifier):
clf = classifier(local_classifier=LogisticRegression())
y = np.array([["a", "b", "c"], ["a", "b", "d"]])
X = np.random.randint(1, 11, size=(2, 10))

clf.fit(X, y)
assert isinstance(clf.local_classifier_, LogisticRegression)

clf._change_local_classifier(KNeighborsClassifier())
assert isinstance(clf.local_classifier_, KNeighborsClassifier)