Skip to content

Commit

Permalink
Remove a redundant definition
Browse files Browse the repository at this point in the history
  • Loading branch information
cchrewrite committed Dec 20, 2021
1 parent ee9089e commit aaae6a8
Showing 1 changed file with 0 additions and 50 deletions.
50 changes: 0 additions & 50 deletions examples/models/new_energy_analysis/MLPBatteryCapacityEstimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,56 +142,6 @@ def min_max_normalisation(self, feat_data, min_arr, max_arr):
res = np.array(res).T
return res

def read_discharge_data(self, data_file):

time_interval = self.time_interval
time_length = self.time_length

f = open(data_file, "r")
data_header = ""
feat_data = []
tgt_data = []
for x in f.readlines():
x = x.replace("\n","")
if x == "":
continue
if data_header == "":
data_header = x.split(",")
continue

if x == "<Start of Discharging>":
data_matrix = []
continue

elif x == "<End of Discharging>":
data_matrix = np.asarray(data_matrix)
t = data_matrix[:,data_header.index("Time")]
target = data_matrix[-1,data_header.index("Capacity")]
data_matrix_ali = []

for i in range(len(data_header)):
if data_header[i] == "Capacity":
continue
elif data_header[i] == "Time":
continue
else:
v = data_matrix.T[i].T.tolist()
v_ali, t_ali = self.data_alignment(v, t, time_interval)
data_matrix_ali.append(v_ali)
data_matrix_ali = np.asarray(data_matrix_ali).T
for i in range(data_matrix_ali.shape[0]-time_length):
feature = data_matrix_ali[i:(i+time_length),:]
feature = feature.reshape(feature.shape[0] * feature.shape[1])
feat_data.append(feature)
tgt_data.append(target)
else:
x = x.split(",")
x = [float(p) for p in x]
data_matrix.append(x)

return data_header, feat_data, tgt_data


def read_discharge_data(self, data_file):

time_interval = self.time_interval
Expand Down

0 comments on commit aaae6a8

Please sign in to comment.