diff --git a/.idea/ECG_by_Diffenert_CNN_Test.iml b/.idea/ECG_by_Diffenert_CNN_Test.iml index dc26ab5..b9284b0 100644 --- a/.idea/ECG_by_Diffenert_CNN_Test.iml +++ b/.idea/ECG_by_Diffenert_CNN_Test.iml @@ -1,7 +1,9 @@ - + + + diff --git a/Number-Of-CNN-Layers/One/logs/20230318-170806/train/events.out.tfevents.1679130489.WEIYUQING.48936.0.v2 b/Number-Of-CNN-Layers/One/logs/20230318-170806/train/events.out.tfevents.1679130489.WEIYUQING.48936.0.v2 new file mode 100644 index 0000000..3345f83 Binary files /dev/null and b/Number-Of-CNN-Layers/One/logs/20230318-170806/train/events.out.tfevents.1679130489.WEIYUQING.48936.0.v2 differ diff --git a/Number-Of-CNN-Layers/One/logs/20230318-170806/validation/events.out.tfevents.1679130496.WEIYUQING.48936.1.v2 b/Number-Of-CNN-Layers/One/logs/20230318-170806/validation/events.out.tfevents.1679130496.WEIYUQING.48936.1.v2 new file mode 100644 index 0000000..be77827 Binary files /dev/null and b/Number-Of-CNN-Layers/One/logs/20230318-170806/validation/events.out.tfevents.1679130496.WEIYUQING.48936.1.v2 differ diff --git a/Number-Of-CNN-Layers/One/model/ecg_model_one_layer.h5 b/Number-Of-CNN-Layers/One/model/ecg_model_one_layer.h5 index c072127..7ad019c 100644 Binary files a/Number-Of-CNN-Layers/One/model/ecg_model_one_layer.h5 and b/Number-Of-CNN-Layers/One/model/ecg_model_one_layer.h5 differ diff --git a/Number-Of-CNN-Layers/One/picture/accuracy.png b/Number-Of-CNN-Layers/One/picture/accuracy.png index 4561d66..a21e48d 100644 Binary files a/Number-Of-CNN-Layers/One/picture/accuracy.png and b/Number-Of-CNN-Layers/One/picture/accuracy.png differ diff --git a/Number-Of-CNN-Layers/One/picture/confusion_matrix.png b/Number-Of-CNN-Layers/One/picture/confusion_matrix.png index a36a528..faed28f 100644 Binary files a/Number-Of-CNN-Layers/One/picture/confusion_matrix.png and b/Number-Of-CNN-Layers/One/picture/confusion_matrix.png differ diff --git a/Number-Of-CNN-Layers/One/picture/loss.png b/Number-Of-CNN-Layers/One/picture/loss.png index 8c88c9f..839b704 100644 Binary files a/Number-Of-CNN-Layers/One/picture/loss.png and b/Number-Of-CNN-Layers/One/picture/loss.png differ diff --git a/Number-Of-CNN-Layers/Two/logs/20230318-162330/train/events.out.tfevents.1679127816.WEIYUQING.46432.0.v2 b/Number-Of-CNN-Layers/Two/logs/20230318-162330/train/events.out.tfevents.1679127816.WEIYUQING.46432.0.v2 index d3f29c6..fd96604 100644 Binary files a/Number-Of-CNN-Layers/Two/logs/20230318-162330/train/events.out.tfevents.1679127816.WEIYUQING.46432.0.v2 and b/Number-Of-CNN-Layers/Two/logs/20230318-162330/train/events.out.tfevents.1679127816.WEIYUQING.46432.0.v2 differ diff --git a/Number-Of-CNN-Layers/Two/logs/20230318-162330/validation/events.out.tfevents.1679127831.WEIYUQING.46432.1.v2 b/Number-Of-CNN-Layers/Two/logs/20230318-162330/validation/events.out.tfevents.1679127831.WEIYUQING.46432.1.v2 new file mode 100644 index 0000000..6d67809 Binary files /dev/null and b/Number-Of-CNN-Layers/Two/logs/20230318-162330/validation/events.out.tfevents.1679127831.WEIYUQING.46432.1.v2 differ diff --git a/Number-Of-CNN-Layers/Two/model/ecg_model_one_layer.h5 b/Number-Of-CNN-Layers/Two/model/ecg_model_one_layer.h5 new file mode 100644 index 0000000..bb5a761 Binary files /dev/null and b/Number-Of-CNN-Layers/Two/model/ecg_model_one_layer.h5 differ diff --git a/Number-Of-CNN-Layers/Two/picture/confusion_matrix.png b/Number-Of-CNN-Layers/Two/picture/confusion_matrix.png new file mode 100644 index 0000000..e773f24 Binary files /dev/null and b/Number-Of-CNN-Layers/Two/picture/confusion_matrix.png differ diff --git a/_mian_tensorflow_oneLayerCNN.py b/Number-Of-CNN-Layers/_mian_tensorflow_oneLayerCNN.py similarity index 97% rename from _mian_tensorflow_oneLayerCNN.py rename to Number-Of-CNN-Layers/_mian_tensorflow_oneLayerCNN.py index 1d817c3..060cb02 100644 --- a/_mian_tensorflow_oneLayerCNN.py +++ b/Number-Of-CNN-Layers/_mian_tensorflow_oneLayerCNN.py @@ -6,11 +6,11 @@ import pywt import wfdb import tensorflow as tf from tensorflow import keras -from utils import loadData, plot_history_tf, plot_heat_map +from utils_oneLayerCNN import loadData, plot_history_tf, plot_heat_map #from ECG_read_weiyuqing_without_wfdb import ECGDATAPATH #PATH of this test -Project_PATH = "./Number-Of-CNN-Layers/One/" +Project_PATH = "../Number-Of-CNN-Layers/One/" #PICTUREPATH= Project_PATH + "picture/" log_dir = Project_PATH + "logs/" + datetime.datetime.now().strftime("%Y%m%d-%H%M%S") model_Path_one = Project_PATH + "model/ecg_model_one_layer.h5" diff --git a/utils.py b/Number-Of-CNN-Layers/utils_oneLayerCNN.py similarity index 92% rename from utils.py rename to Number-Of-CNN-Layers/utils_oneLayerCNN.py index 12eac22..a753fb4 100644 --- a/utils.py +++ b/Number-Of-CNN-Layers/utils_oneLayerCNN.py @@ -1,5 +1,5 @@ - -#this file give +# this file give +import os import wfdb import pywt @@ -10,13 +10,13 @@ from sklearn.metrics import confusion_matrix from sklearn.model_selection import train_test_split # from _mian_tensorflow import Project_PATH -Project_PATH = "./Number-Of-CNN-Layers/Two/" - -PICTUREPATH= Project_PATH +'picture/' +Project_PATH = '../Number-Of-CNN-Layers/One/' +PICTUREPATH = Project_PATH + 'picture/' # from ECG_read_weiyuqing_without_wfdb import ECGDATAPATH -MITBITECGDATAPATH='./MIT-BIT/' +MITBITECGDATAPATH = '../MIT-BIT/' + # wavelet denoise preprocess using mallat algorithm @@ -42,7 +42,7 @@ def denoise(date): def getDataSet(number, X_data, Y_data): ecgClassSet = ['N', 'A', 'V', 'L', 'R'] print('get' + number + ' ECG data') - record = wfdb.rdrecord(MITBITECGDATAPATH+ number, channel_names=['MLII']) + record = wfdb.rdrecord(MITBITECGDATAPATH + number, channel_names=['MLII']) data = record.p_signal.flatten() # use def denoise rdata = denoise(date=data) @@ -92,7 +92,6 @@ def loadData(ratio, random_seed): # print(X_train, X_test, y_train, y_test) return X_train, X_test, y_train, y_test - # train_ds = np.hstack((dataSet, labelSet)) # np.random.shuffle(train_ds) # @@ -114,7 +113,7 @@ def plot_heat_map(y_test, y_pred): # normalize # con_mat_norm = con_mat.astype('float') / con_mat.sum(axis=1)[:, np.newaxis] # con_mat_norm = np.around(con_mat_norm, decimals=2) - + # os.remove(PICTUREPATH+'confusion_matrix.png') # plot plt.figure(figsize=(8, 8)) seaborn.heatmap(con_mat, annot=True, fmt='.20g', cmap='Blues') @@ -127,6 +126,9 @@ def plot_heat_map(y_test, y_pred): def plot_history_tf(history): + # os.remove(PICTUREPATH+'accuracy.png') + # os.remove(PICTUREPATH+'loss.png') + plt.figure(figsize=(8, 8)) plt.plot(history.history['accuracy']) plt.plot(history.history['val_accuracy']) @@ -166,5 +168,5 @@ def plot_history_torch(history): plt.ylabel('Loss') plt.xlabel('Epoch') plt.legend(['Train', 'Test'], loc='upper left') - plt.savefig(PICTUREPATH +'loss.png') + plt.savefig(PICTUREPATH + 'loss.png') plt.show() diff --git a/ECG_read_by_wfdb.py b/some-test/ECG_read_by_wfdb.py similarity index 100% rename from ECG_read_by_wfdb.py rename to some-test/ECG_read_by_wfdb.py diff --git a/ECG_read_weiyuqing_without_wfdb.py b/some-test/ECG_read_weiyuqing_without_wfdb.py similarity index 100% rename from ECG_read_weiyuqing_without_wfdb.py rename to some-test/ECG_read_weiyuqing_without_wfdb.py