Remove category label case-insensitiveness (#8)

Category labels are no longer case insensitive. Plus, the following folders were renamed: pyss3/resources/visual_classifier/ -> pyss3/resources/live_test/ pyss3/resources/model_evaluation/ -> pyss3/resources/evaluation_plot/ Resolves: #8
sergioburdisso · May 17, 2020 · 4ec009a · 4ec009a
1 parent 79f1e9d
commit 4ec009a
Show file tree

Hide file tree

Showing 31 changed files with 4 additions and 8 deletions.
diff --git a/pyss3/__init__.py b/pyss3/__init__.py
@@ -567,8 +567,6 @@ def __get_category__(self, name):
 
         If category name doesn't exist, creates a new one.
         """
-        if isinstance(name, str):
-            name = name.lower()
         try:
             return self.__categories_index__[name]
         except KeyError:
@@ -1239,8 +1237,6 @@ def get_category_index(self, name):
         :rtype: int
         """
         try:
-            if isinstance(name, str):
-                name = name.lower()
             return self.__categories_index__[name]
         except KeyError:
             return IDX_UNKNOWN_CATEGORY

diff --git a/...s/model_evaluation/angular-animate.min.js → ...es/evaluation_plot/angular-animate.min.js b/...s/model_evaluation/angular-animate.min.js → ...es/evaluation_plot/angular-animate.min.js
diff --git a/...resources/model_evaluation/angular.min.js → .../resources/evaluation_plot/angular.min.js b/...resources/model_evaluation/angular.min.js → .../resources/evaluation_plot/angular.min.js
diff --git a/pyss3/resources/model_evaluation/data.js → pyss3/resources/evaluation_plot/data.js b/pyss3/resources/model_evaluation/data.js → pyss3/resources/evaluation_plot/data.js
diff --git a/...es/model_evaluation/model_evaluation.html → ...ces/evaluation_plot/model_evaluation.html b/...es/model_evaluation/model_evaluation.html → ...ces/evaluation_plot/model_evaluation.html
diff --git a/.../resources/model_evaluation/plotly.min.js → ...3/resources/evaluation_plot/plotly.min.js b/.../resources/model_evaluation/plotly.min.js → ...3/resources/evaluation_plot/plotly.min.js
diff --git a/...al_classifier/css/bootstrap-theme.min.css → ...ces/live_test/css/bootstrap-theme.min.css b/...al_classifier/css/bootstrap-theme.min.css → ...ces/live_test/css/bootstrap-theme.min.css
diff --git a/...s/visual_classifier/css/bootstrap.min.css → ...resources/live_test/css/bootstrap.min.css b/...s/visual_classifier/css/bootstrap.min.css → ...resources/live_test/css/bootstrap.min.css
diff --git a/.../resources/visual_classifier/css/icon.css → pyss3/resources/live_test/css/icon.css b/.../resources/visual_classifier/css/icon.css → pyss3/resources/live_test/css/icon.css
diff --git a/...ces/visual_classifier/css/materialize.css → ...3/resources/live_test/css/materialize.css b/...ces/visual_classifier/css/materialize.css → ...3/resources/live_test/css/materialize.css
diff --git a/...visual_classifier/css/materialize.min.css → ...sources/live_test/css/materialize.min.css b/...visual_classifier/css/materialize.min.css → ...sources/live_test/css/materialize.min.css
diff --git a/...3/resources/visual_classifier/favicon.ico → pyss3/resources/live_test/favicon.ico b/...3/resources/visual_classifier/favicon.ico → pyss3/resources/live_test/favicon.ico
diff --git a/...resources/visual_classifier/fonts/cmu.css → pyss3/resources/live_test/fonts/cmu.css b/...resources/visual_classifier/fonts/cmu.css → pyss3/resources/live_test/fonts/cmu.css
diff --git a/...urces/visual_classifier/fonts/cmunbx.woff → pyss3/resources/live_test/fonts/cmunbx.woff b/...urces/visual_classifier/fonts/cmunbx.woff → pyss3/resources/live_test/fonts/cmunbx.woff
diff --git a/...urces/visual_classifier/fonts/cmunrm.woff → pyss3/resources/live_test/fonts/cmunrm.woff b/...urces/visual_classifier/fonts/cmunrm.woff → pyss3/resources/live_test/fonts/cmunrm.woff
diff --git a/...urces/visual_classifier/fonts/cmunsl.woff → pyss3/resources/live_test/fonts/cmunsl.woff b/...urces/visual_classifier/fonts/cmunsl.woff → pyss3/resources/live_test/fonts/cmunsl.woff
diff --git a/...urces/visual_classifier/fonts/cmunti.woff → pyss3/resources/live_test/fonts/cmunti.woff b/...urces/visual_classifier/fonts/cmunti.woff → pyss3/resources/live_test/fonts/cmunti.woff
diff --git a/...ources/visual_classifier/fonts/icon.woff2 → pyss3/resources/live_test/fonts/icon.woff2 b/...ources/visual_classifier/fonts/icon.woff2 → pyss3/resources/live_test/fonts/icon.woff2
diff --git a/pyss3/resources/visual_classifier/index.html → pyss3/resources/live_test/index.html b/pyss3/resources/visual_classifier/index.html → pyss3/resources/live_test/index.html
diff --git a/...sual_classifier/js/angular-animate.min.js → ...urces/live_test/js/angular-animate.min.js b/...sual_classifier/js/angular-animate.min.js → ...urces/live_test/js/angular-animate.min.js
diff --git a/...urces/visual_classifier/js/angular.min.js → pyss3/resources/live_test/js/angular.min.js b/...urces/visual_classifier/js/angular.min.js → pyss3/resources/live_test/js/angular.min.js
diff --git a/pyss3/resources/visual_classifier/js/app.js → pyss3/resources/live_test/js/app.js b/pyss3/resources/visual_classifier/js/app.js → pyss3/resources/live_test/js/app.js
diff --git a/.../resources/visual_classifier/js/global.js → pyss3/resources/live_test/js/global.js b/.../resources/visual_classifier/js/global.js → pyss3/resources/live_test/js/global.js
diff --git a/.../visual_classifier/js/jquery-1.7.2.min.js → ...esources/live_test/js/jquery-1.7.2.min.js b/.../visual_classifier/js/jquery-1.7.2.min.js → ...esources/live_test/js/jquery-1.7.2.min.js
diff --git a/...ces/visual_classifier/js/jquery-ui.min.js → ...3/resources/live_test/js/jquery-ui.min.js b/...ces/visual_classifier/js/jquery-ui.min.js → ...3/resources/live_test/js/jquery-ui.min.js
diff --git a/...s/visual_classifier/js/materialize.min.js → ...resources/live_test/js/materialize.min.js b/...s/visual_classifier/js/materialize.min.js → ...resources/live_test/js/materialize.min.js
diff --git a/...resources/visual_classifier/sb-blanco.png → pyss3/resources/live_test/sb-blanco.png b/...resources/visual_classifier/sb-blanco.png → pyss3/resources/live_test/sb-blanco.png
diff --git a/pyss3/resources/visual_classifier/unsl.png → pyss3/resources/live_test/unsl.png b/pyss3/resources/visual_classifier/unsl.png → pyss3/resources/live_test/unsl.png
diff --git a/pyss3/server.py b/pyss3/server.py
@@ -50,7 +50,7 @@
 }
 
 ENCODING = "utf-8"
-BASE_PATH = path.join(path.dirname(__file__), "resources/visual_classifier")
+BASE_PATH = path.join(path.dirname(__file__), "resources/live_test")
 
 
 def main():

diff --git a/pyss3/util.py b/pyss3/util.py
@@ -46,7 +46,7 @@ def multilabel_confusion_matrix(*args):
 REGEX_DOTS_CHAINED = re.compile(r"(?:(#[a-zA-Z0-9]+)(\s)*(?=#))")
 
 EVAL_HTML_OUT_FILE = "ss3_model_evaluation[%s].html"
-EVAL_HTML_SRC_FOLDER = "resources/model_evaluation/"
+EVAL_HTML_SRC_FOLDER = "resources/evaluation_plot/"
 EVAL_CACHE_EXT = ".ss3ev"
 
 STR_ACCURACY, STR_PRECISION = "accuracy", "precision"

diff --git a/tests/test_pyss3.py b/tests/test_pyss3.py
@@ -93,8 +93,8 @@ def perform_tests_with(clf, cv_test, stopwords=True):
     most_prob_cat = clf.get_most_probable_category()
     most_prob_cat_idx = clf.__get_most_probable_category__()
 
-    # category names case-insensitiveness check
-    assert clf.get_category_index("SpOrTs") == clf.get_category_index("sports")
+    # category names case-sensitiveness check
+    assert clf.get_category_index("SpOrTs") == -1
 
     # predict
     y_pred = clf.predict(x_test)