Skip to content
Merged
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
2 changes: 1 addition & 1 deletion dialectid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

__version__ = '0.1.3'
__version__ = '0.1.4'

# from dialectid.text_repr import BoW, SeqTM
from dialectid.model import DialectId, BoW
29 changes: 25 additions & 4 deletions dialectid/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,8 @@ def seqTM(self):
def seqTM(self, value):
self._seqTM = value

def predict_proba(self, texts: list):
"""Predict proba"""
assert self.probability
X = self.transform(texts)
def _predict_proba(self, X: np.ndarray):
"""Predict probability helper function"""
norm = Normalizer()
X = norm.transform(X)
coef, intercept = self.proba_coefs
Expand All @@ -91,13 +89,36 @@ def predict_proba(self, texts: list):
expit(res, out=res)
return np.c_[1 - res, res]
return softmax(res)

def predict_proba(self, texts: list):
"""Predict proba"""
assert self.probability
X = self.transform(texts)
return self._predict_proba(X)

def decision_function(self, texts: list):
"""Decision function"""
X = self.transform(texts)
if X.shape[1] == 1:
X = np.c_[-X[:, 0], X[:, 0]]
return X

def positive(self, texts: list):
"""Positive classes"""
X = self.transform(texts)
X_df = X
if X_df.shape[1] == 1:
X_df = np.c_[-X_df[:, 0], X_df[:, 0]]
if self.probability:
X = self._predict_proba(X)
else:
X = X_df
output = []
labels = self.countries
for mask, value in zip(X_df > 0, X):
_ = {str(k): v for k, v in zip(labels[mask], value[mask])}
output.append(_)
return output

def predict(self, texts: list):
"""predict"""
Expand Down
14 changes: 14 additions & 0 deletions dialectid/tests/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,17 @@ def test_DialectId_model():
dial = DialectId(lang='es')
assert len(dial.countries) == 21
dial.predict(['comiendo unos tacos'])


def test_DialectId_positive():
"""Test DialectID"""

dial = DialectId(lang='es')
output1 = dial.positive(['comiendo unos tacos'])
assert 'mx' in output1[0] and 'gt' in output1[0]
dial.probability = True
output2 = dial.positive(['comiendo unos tacos'])
assert len(output2) == len(output1)
for probability in [True, False]:
dial = DialectId(lang='tr', probability=probability)
dial.positive(['comiendo unos tacos'])
Loading
Loading