Skip to content

Commit 1d7f426

Browse files
committed
fixes associated with text module
1 parent eec8b63 commit 1d7f426

File tree

4 files changed

+534
-591
lines changed

4 files changed

+534
-591
lines changed

pvops/text/classify.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def classification_deployer(
9797
9898
.. code-block:: python
9999
100-
scoring = make_scorer(f1_score, average = 'weighted')
100+
scoring = make_scorer(f1_score, average = 'weighted', pos_label = None)
101101
102102
For unsupervised classifiers, one could specify
103103

pvops/text/defaults.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def supervised_classifier_defs(settings_flag):
9090
"clf__C": np.logspace(0, 4, 10),
9191
},
9292
"PassiveAggressiveClassifier": {
93-
"clf__C": [0.0, 0.01, 0.1, 1.0],
93+
"clf__C": [0.001, 0.01, 0.1, 1.0],
9494
"clf__loss": ["hinge", "squared_hinge"],
9595
},
9696
"RidgeClassifier": {
@@ -119,7 +119,7 @@ def supervised_classifier_defs(settings_flag):
119119
"AdaBoostClassifier": {
120120
"clf__n_estimators": [50, 100],
121121
"clf__learning_rate": [1.0, 0.9, 0.8],
122-
"clf__algorithm": ["SAMME.R"],
122+
"clf__algorithm": ["SAMME"],
123123
},
124124
}
125125
elif settings_flag == "normal":
@@ -152,7 +152,7 @@ def supervised_classifier_defs(settings_flag):
152152
"clf__C": np.logspace(0, 4, 10),
153153
},
154154
"PassiveAggressiveClassifier": {
155-
"clf__C": [0.0, 0.01, 0.1, 1.0],
155+
"clf__C": [0.001, 0.01, 0.1, 1.0],
156156
"clf__loss": ["hinge", "squared_hinge"],
157157
},
158158
"RidgeClassifier": {
@@ -182,7 +182,7 @@ def supervised_classifier_defs(settings_flag):
182182
"AdaBoostClassifier": {
183183
"clf__n_estimators": [50, 100],
184184
"clf__learning_rate": [1.0, 0.9, 0.8],
185-
"clf__algorithm": ["SAMME.R"],
185+
"clf__algorithm": ["SAMME"],
186186
},
187187
}
188188
elif settings_flag == "detailed":
@@ -215,7 +215,7 @@ def supervised_classifier_defs(settings_flag):
215215
"clf__C": np.logspace(0, 4, 10),
216216
},
217217
"PassiveAggressiveClassifier": {
218-
"clf__C": [0.0, 0.01, 0.1, 1.0],
218+
"clf__C": [0.001, 0.01, 0.1, 1.0],
219219
"clf__loss": ["hinge", "squared_hinge"],
220220
},
221221
"RidgeClassifier": {
@@ -245,7 +245,7 @@ def supervised_classifier_defs(settings_flag):
245245
"AdaBoostClassifier": {
246246
"clf__n_estimators": [30, 50, 100, 150, 300],
247247
"clf__learning_rate": [1.0, 0.9, 0.8, 0.4],
248-
"clf__algorithm": ["SAMME.R", "SAMME"],
248+
"clf__algorithm": ["SAMME"],
249249
},
250250
}
251251

tutorials/text_class_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def classify_supervised(
349349
pipeline_steps = [
350350
("doc2vec", nlp_utils.Doc2VecModel()), ("clf", None)]
351351

352-
scoring = make_scorer(f1_score, average="weighted")
352+
scoring = make_scorer(f1_score, average="weighted", pos_label=None)
353353
self.greater_is_better = True
354354

355355
if user_defined_classes is None or user_defined_search_space is None:

tutorials/tutorial_textmodule.ipynb

+526-583
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)