yms-kan 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

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/version.py

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

{yms_kan-0.0.3.dist-info → yms_kan-0.0.5.dist-info}/METADATA

@@ -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.dist-info → yms_kan-0.0.5.dist-info}/RECORD

@@ -10,13 +10,13 @@ yms_kan/feynman.py,sha256=Eisf69K49s4C6UlPEi5LnNK_p5TUJQLBKxMp-sW0a9w,33687
 yms_kan/hypothesis.py,sha256=Ec20xadfgOSSWeZHQaGn-h9F2PY7LWFU3iniNI2Zd_4,23165
 yms_kan/spline.py,sha256=ZXyGwl2Sc-UrnrcuUXeUQkBOMnetaWcHrbpZaqatCvs,4345
 yms_kan/tool.py,sha256=rkRpqF3EcsAq7a3k1F1zKlxfJ4U9n-FzHyNCJgN4URY,21159
-yms_kan/train_eval_utils.py,sha256=y5eI6-kJU51pKTgB3TdwGyu1QKTACwbamZ9ZOdhPogc,17184
+yms_kan/train_eval_utils.py,sha256=e6XqlE3_i-AcGkWsWrVUjBsphTDK5T21sWR_RIJiTEs,16536
 yms_kan/utils.py,sha256=J07L-tgmc1OfU6Tl6mGwHJRizjFN75EJK8BxejaZLUc,23860
-yms_kan/version.py,sha256=ue5T-H1rqmrk8ISYQmYosD_ZfIp5J-L-wsfBrW8sgCw,39
+yms_kan/version.py,sha256=OUUIPtK264nL8fStaLu6GUnNkVZ5X18jfSMcppcWpa4,39
 yms_kan/assets/img/mult_symbol.png,sha256=2f4xUKdweft-qUbHjFI5h9-smnEtc0FWq8hNYZhPAXY,6392
 yms_kan/assets/img/sum_symbol.png,sha256=94QkMUzmEjlCq_yf14nMEQmettaq86FmlGfdl22b4XE,6210
-yms_kan-0.0.3.dist-info/licenses/LICENSE,sha256=BJXDWyF4Groqtnp4Gi9puH4aLg7A2IC3MpHmC-cSxwc,1067
-yms_kan-0.0.3.dist-info/METADATA,sha256=o53cYpZ1jV7K8ptCYWV5aG-jsekuKcb6wuzJW_sxsWo,240
-yms_kan-0.0.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-yms_kan-0.0.3.dist-info/top_level.txt,sha256=Z_JDh6yZf-EiW1eKgL6ADsN2yqEMRMspi-o29JZ1WPo,8
-yms_kan-0.0.3.dist-info/RECORD,,
+yms_kan-0.0.5.dist-info/licenses/LICENSE,sha256=BJXDWyF4Groqtnp4Gi9puH4aLg7A2IC3MpHmC-cSxwc,1067
+yms_kan-0.0.5.dist-info/METADATA,sha256=upxdcPXd-Frc3q0KyYZUahqV12F_toxb5Kh2TGGXNVs,240
+yms_kan-0.0.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+yms_kan-0.0.5.dist-info/top_level.txt,sha256=Z_JDh6yZf-EiW1eKgL6ADsN2yqEMRMspi-o29JZ1WPo,8
+yms_kan-0.0.5.dist-info/RECORD,,