Commit 05cd28ae authored by Markus Mirz's avatar Markus Mirz

clean up

parent cee284ae
......@@ -84,14 +84,17 @@ def read_timeseries_dpsim_cmpl(filename, timeseries_names=None):
:param timeseries_names: column name which should be read
:return: list of Timeseries objects
pd_df = pd.read_csv(filename, header=None)
pd_df = pd.read_csv(filename)
timeseries_list = []
if timeseries_names is None:
# No trajectory names specified, thus read in all
pd_df.rename(columns=lambda x: x.strip(), inplace=True)
column_names = list(pd_df.columns.values)
# Remove timestamps column name and store separately
timestamps = pd_df.iloc[:,0]
# Calculate number of network nodes since array is [real, imag]
node_number = int(len(column_names) / 2)
......@@ -99,7 +102,7 @@ def read_timeseries_dpsim_cmpl(filename, timeseries_names=None):
for column in column_names:
if node_index <= node_number:
ts_name = 'node '+ str(node_index)
timeseries_list.append(TimeSeries(ts_name, timestamps, np.vectorize(complex)(pd_df.iloc[:,column],pd_df.iloc[:,column + node_number])))
timeseries_list.append(TimeSeries(ts_name, timestamps, np.vectorize(complex)(pd_df.iloc[:,node_index],pd_df.iloc[:,node_index + node_number])))
node_index = node_index + 1
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment