Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
Data Processing
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACS
P
Public
VILLASframework
Data Processing
Commits
a99eaa5b
Commit
a99eaa5b
authored
Jul 24, 2018
by
Markus Mirz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'dev'
# Conflicts: # dataprocessing/readtools.py
parents
fb05221d
a3ba9ed8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
dataprocessing/readtools.py
dataprocessing/readtools.py
+18
-0
No files found.
dataprocessing/readtools.py
View file @
a99eaa5b
...
...
@@ -54,6 +54,24 @@ def read_timeseries_PLECS(filename, timeseries_names=None):
return
timeseries_list
def
read_timeseries_simulink
(
filename
,
timeseries_names
=
None
):
pd_df
=
pd
.
read_csv
(
filename
)
timeseries_list
=
[]
if
timeseries_names
is
None
:
# No trajectory names specified, thus read in all
timeseries_names
=
list
(
pd_df
.
columns
.
values
)
timeseries_names
.
remove
(
'time'
)
for
name
in
timeseries_names
:
timeseries_list
.
append
(
TimeSeries
(
name
,
pd_df
[
'time'
].
values
,
pd_df
[
name
].
values
))
else
:
# Read in specified time series
for
name
in
timeseries_names
:
timeseries_list
.
append
(
TimeSeries
(
name
,
pd_df
[
'time'
].
values
,
pd_df
[
name
].
values
))
print
(
'Simulink results column names: '
+
str
(
timeseries_names
))
print
(
'Simulink results number: '
+
str
(
len
(
timeseries_list
)))
return
timeseries_list
def
read_timeseries_dpsim_real
(
filename
,
timeseries_names
=
None
):
"""Reads real time series data from DPsim log file which may have a header.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment