yms-kan 0.0.3__tar.gz → 0.0.5__tar.gz

{yms_kan-0.0.3/yms_kan.egg-info → yms_kan-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yms_kan
-Version: 0.0.3
+Version: 0.0.5
 Summary: My awesome package
 Author-email: yms <11@qq.com>
 License-Expression: MIT

{yms_kan-0.0.3 → yms_kan-0.0.5}/yms_kan/train_eval_utils.py

@@ -5,27 +5,11 @@ import sys
 import numpy as np
 import torch
 from matplotlib import pyplot as plt
-from sklearn.metrics import classification_report
 from torch.optim.lr_scheduler import ReduceLROnPlateau
 from tqdm import tqdm
 
 from yms_kan import LBFGS
-from yms_kan.tool import initialize_results_file, append_to_results_file
-
-
-def calculate_metric(all_labels, all_predictions, classes, class_metric=False, average='macro avg'):
-    metric = classification_report(y_true=all_labels, y_pred=all_predictions,
-                                   target_names=classes, digits=4, output_dict=True, zero_division=0)
-    if not class_metric:
-        metric = {
-            'accuracy': metric.get('accuracy'),
-            'precision': metric.get(average).get('precision'),
-            'recall': metric.get(average).get('recall'),
-            'f1-score': metric.get(average).get('f1-score'),
-        }
-        return metric
-    else:
-        return metric
+from yms_kan.tool import initialize_results_file, append_to_results_file, calculate_metric
 
 
 def train_val(model, dataset: dict, batch_size, batch_size_test, save_path, txt_file=None, opt="LBFGS", epochs=100,
@@ -72,7 +56,7 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, save_path, txt_
     lr_scheduler = ReduceLROnPlateau(optimizer, mode='min', factor=0.1, patience=5, min_lr=1e-9)
 
     results = {'train_losses': [], 'val_losses': [], 'accuracies': [], 'precisions': [], 'recalls': [], 'f1-scores': [],
-               'lrs': [], 'all_predictions': [], 'all_labels': []}
+               'lrs': [], 'all_predictions': [], 'all_labels': [], 'regularize': []}
 
     steps = math.ceil(dataset['train_input'].shape[0] / batch_size)
 
@@ -177,7 +161,7 @@ def train_val(model, dataset: dict, batch_size, batch_size_test, save_path, txt_
         if label is not None:
             m = calculate_metric(all_labels, all_predictions, class_dict)
             print(m)
-            results["accuracy"].append(m["accuracy"])
+            results["accuracies"].append(m["accuracy"])
             results["precisions"].append(m["precision"])
             results["recalls"].append(m["recall"])
             results["f1-scores"].append(m["f1-score"])

yms_kan-0.0.5/yms_kan/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.5"  # 初始版本

{yms_kan-0.0.3 → yms_kan-0.0.5/yms_kan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yms_kan
-Version: 0.0.3
+Version: 0.0.5
 Summary: My awesome package
 Author-email: yms <11@qq.com>
 License-Expression: MIT

yms_kan-0.0.3/yms_kan/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.3"  # 初始版本