Skip to content

Commit

Permalink
cmt-20230409-2: some fixs
Browse files Browse the repository at this point in the history
  • Loading branch information
nicewang committed Apr 9, 2023
1 parent f2d4325 commit 14c7491
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 60 deletions.
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter/cross_validation/new2/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter/cross_validation/new22/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter/cross_validation/new32/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter/cross_validation/new42/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter1/cross_validation/new2/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter1/cross_validation/new22/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter1/cross_validation/new32/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
4 changes: 2 additions & 2 deletions cnn_gray/resize_filter1/cross_validation/new42/cnn_train1.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

model_path = "model/model.ckpt"

data0 = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data0 = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")
data = []
for i in range(data0.shape[0]):
data_tmp = data0[i,:]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
label = np.genfromtxt("train_set_new/labels.txt")
data = np.genfromtxt("train_set/training data.txt")
label = np.genfromtxt("train_set/labels.txt")

print(data.shape)
print(label.shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
count = count + 1
print(count)

np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", label_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", label_new)
8 changes: 4 additions & 4 deletions data_augmentation/data_augmentation_1.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
import numpy as np

data = np.genfromtxt("train_set_new/training data.txt")
data = np.genfromtxt("train_set/training data.txt")
# print(data.shape)
labels = np.genfromtxt("train_set_new/labels.txt")
labels = np.genfromtxt("train_set/labels.txt")

data_origin = []
data_flip_a = []
Expand Down Expand Up @@ -121,5 +121,5 @@
# if labels_new[i] == 1:
# abnormal_count_new = abnormal_count_new + 1
# print(abnormal_count_new)
np.savetxt("train_set_new/training data.txt", data_new)
np.savetxt("train_set_new/labels.txt", labels_new)
np.savetxt("train_set/training data.txt", data_new)
np.savetxt("train_set/labels.txt", labels_new)
2 changes: 1 addition & 1 deletion rnn_gray/SignalDataSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def getDataLabel(path):
return data, label

# validation
# path = 'train_set_new/'
# path = 'train_set/'
# data, label = getDataLabel(path)
# print(data.shape)
# print(label.shape)
2 changes: 1 addition & 1 deletion rnn_gray/rnn_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def get_dataset(path):
label = label[order]
return data, label

test_data, test_target = get_dataset('test_set_new/')
test_data, test_target = get_dataset('test_set/')
print(test_data.shape)
print(test_target.shape)

Expand Down
6 changes: 3 additions & 3 deletions rnn_gray/rnn_train.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

def get_dataset(path):
# Flatten images into vectors.
# path = 'train_set_new/'
# path = 'train_set/'
data,label = getDataLabel(path)
data = data.reshape(data.shape[:2] + (-1,))
# One-hot encode labels.
Expand All @@ -42,10 +42,10 @@ def get_dataset(path):


# Split into training and test data.
train_data, train_target = get_dataset('train_set_new/')
train_data, train_target = get_dataset('train_set/')
print(train_data.shape)
print(train_target.shape)
test_data, test_target = get_dataset('test_set_new/')
test_data, test_target = get_dataset('test_set/')
print(test_data.shape)
print(test_target.shape)
abnormal_data = []
Expand Down
6 changes: 3 additions & 3 deletions rnn_gray/rnn_train_bidirectional.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

def get_dataset(path):
# Flatten images into vectors.
# path = 'train_set_new/'
# path = 'train_set/'
data,label = getDataLabel(path)
data = data.reshape(data.shape[:2] + (-1,))
# One-hot encode labels.
Expand All @@ -42,10 +42,10 @@ def get_dataset(path):
return data, label

# Split into training and test data.
train_data, train_target = get_dataset('train_set_new/')
train_data, train_target = get_dataset('train_set/')
print(train_data.shape)
print(train_target.shape)
test_data, test_target = get_dataset('test_set_new/')
test_data, test_target = get_dataset('test_set/')
print(test_data.shape)
print(test_target.shape)
abnormal_data = []
Expand Down

0 comments on commit 14c7491

Please sign in to comment.