xlin 0.1.30__py2.py3-none-any.whl → 0.1.32__py2.py3-none-any.whl

xlin/statistic.py

@@ -203,7 +203,7 @@ def generate_classification_report(predictions: List[str], labels: List[str]) ->
             pred_label = error_label
         confusion[(true_label, pred_label)] += 1
 
-    confusion_matrix = pd.DataFrame(index=extend_classes, columns=extend_classes, data=0)
+    confusion_matrix = pd.DataFrame(index=classes, columns=extend_classes, data=0)
     for (true, pred), count in confusion.items():
         confusion_matrix.loc[true, pred] = count
 
@@ -212,13 +212,15 @@ def generate_classification_report(predictions: List[str], labels: List[str]) ->
     micro_fp = 0
     micro_fn = 0
     class_stats = []
-    for cls in extend_classes:
+    for cls in classes:
         tp = confusion[(cls, cls)]
         fp = sum(confusion[(other, cls)] for other in extend_classes if other != cls)
         fn = sum(confusion[(cls, other)] for other in extend_classes if other != cls)
-        micro_tp += tp
-        micro_fp += fp
-        micro_fn += fn
+
+        if cls != error_label:
+            micro_tp += tp
+            micro_fp += fp
+            micro_fn += fn
 
         precision = tp / (tp + fp) if (tp + fp) > 0 else 0
         recall = tp / (tp + fn) if (tp + fn) > 0 else 0
@@ -238,7 +240,7 @@ def generate_classification_report(predictions: List[str], labels: List[str]) ->
     class_df = pd.DataFrame(class_stats)
     report["class_report"] = class_df
     confusion_matrix["recall"] = class_df["recall"].values.tolist()
-    p = class_df["precision"].values.tolist() + [None]
+    p = class_df["precision"].values.tolist() + ["", ""]  # [out_of_class, recall]
     tail = pd.DataFrame([p], index=["precision"], columns=confusion_matrix.columns)
     confusion_matrix = pd.concat([confusion_matrix, tail], axis=0)
     confusion_matrix.index.name = "True \\ Pred"
@@ -274,7 +276,10 @@ def convert_to_jsonable_report(report_row):
         elif isinstance(value, list):
             new_report_json[key] = [convert_to_jsonable_report(item) if isinstance(item, dict) else item for item in value]
         elif isinstance(value, pd.DataFrame):
-            new_report_json[key] = value.fillna(-1).to_dict(orient="records")
+            if value.index.name is not None:
+                value = value.reset_index()
+            value = value.fillna(-1)
+            new_report_json[key] = value.to_dict(orient="records")
         else:
             new_report_json[key] = value
     return new_report_json

{xlin-0.1.30.dist-info → xlin-0.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xlin
-Version: 0.1.30
+Version: 0.1.32
 Summary: toolbox for LinXueyuan
 License: MIT
 Author: LinXueyuanStdio

{xlin-0.1.30.dist-info → xlin-0.1.32.dist-info}/RECORD

@@ -4,12 +4,12 @@ xlin/jsonl.py,sha256=IDRydHh2x-8iAGCxt9ScK2wfNLNA40PxNxR5hhr4v6k,7903
 xlin/metric.py,sha256=N7wJ35y-C-IaBr1I1CJ_37lTG7gA69zmn9Xg6xSwKoI,1690
 xlin/multiprocess_mapping.py,sha256=q4EVU8JPLcRAbNf9NUEzmn8rDLDfIQ3jaW0yxVKPECk,16669
 xlin/read_as_dataframe.py,sha256=MqY57L7Wp9UoWTRlZLSBKQNaZa-dKw51-ufrKvHKf8s,9041
-xlin/statistic.py,sha256=UNyVrmJfJ-sG2b9soTQqDicatGTPnWZhs6-e3KX5npg,11111
+xlin/statistic.py,sha256=CsgwUifbN53NnFVk89sp2jXcD7PTkJ9Be_yfTRK5yb4,11284
 xlin/timing.py,sha256=XMT8dMcMolOMohDvAZOIM_BAiPMREhGQKnO1kc5s6PU,998
 xlin/util.py,sha256=TTWJaqF5D_r-gAZ_fj0kyHomvCagjwHXQZ2OPSgwd54,10976
 xlin/xls2xlsx.py,sha256=uSmXcDvIhi5Sq0LGidMXy0wErNBXdjaoa6EftYVjTXs,947
 xlin/yaml.py,sha256=kICi7G3Td5q2MaSXXt85qNTWoHMgjzt7pvn7r3C4dME,183
-xlin-0.1.30.dist-info/LICENSE,sha256=60ys6rRtc1dZOP8UjSUr9fAqhZudT3WpKe5WbMCralM,1066
-xlin-0.1.30.dist-info/METADATA,sha256=IH7h-XO7fz-UormhwHAJ4JUmwHyBVYqxXVijNeojxGw,1098
-xlin-0.1.30.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-xlin-0.1.30.dist-info/RECORD,,
+xlin-0.1.32.dist-info/LICENSE,sha256=60ys6rRtc1dZOP8UjSUr9fAqhZudT3WpKe5WbMCralM,1066
+xlin-0.1.32.dist-info/METADATA,sha256=6pi4rOWvVuQcs0qcMYUUs86kn5hRajpFp0s5u_-PUOQ,1098
+xlin-0.1.32.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+xlin-0.1.32.dist-info/RECORD,,