Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
111
Issues
111
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
797d0d71
Commit
797d0d71
authored
Feb 07, 2019
by
Daniel Lehmberg
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
2b5659df
' into configure_ci_setup
parents
c289171a
2b5659df
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
Tools/SUQController/suqc/__init__.py
Tools/SUQController/suqc/__init__.py
+1
-1
Tools/SUQController/suqc/parameter/sampling.py
Tools/SUQController/suqc/parameter/sampling.py
+1
-1
Tools/SUQController/suqc/qoi.py
Tools/SUQController/suqc/qoi.py
+6
-3
No files found.
Tools/SUQController/suqc/__init__.py
View file @
797d0d71
...
...
@@ -16,4 +16,4 @@ from suqc.parameter.postchanges import ScenarioChanges
from
suqc.qoi
import
*
from
suqc.request
import
*
__version__
=
"1.0"
__version__
=
"1.0
1
"
Tools/SUQController/suqc/parameter/sampling.py
View file @
797d0d71
...
...
@@ -73,7 +73,7 @@ class ParameterVariation(metaclass=abc.ABCMeta):
ret
=
dict
(
row
)
delete_keys
=
list
()
for
k
,
v
in
ret
.
items
():
if
np
.
isnan
(
v
):
if
isinstance
(
v
,
np
.
float
)
and
np
.
isnan
(
v
):
delete_keys
.
append
(
k
)
for
dk
in
delete_keys
:
...
...
Tools/SUQController/suqc/qoi.py
View file @
797d0d71
...
...
@@ -26,7 +26,7 @@ class FileDataInfo(object):
# changes in Vadere. See also vadere issue #199 and #201.
map_outputtype2index
=
{
"IdOutputFile"
:
1
,
"LogEventOutputFile"
:
1
,
"No
t
DataKeyOutputFile"
:
0
,
"NoDataKeyOutputFile"
:
0
,
"PedestrianIdOutputFile"
:
1
,
"TimestepOutputFile"
:
1
,
"TimestepPedestrianIdOutputFile"
:
2
,
...
...
@@ -125,9 +125,12 @@ class QuantityOfInterest(object):
nr_row_indices
=
req_qoi
.
nr_row_indices
df
=
pd
.
read_csv
(
filepath
,
delimiter
=
" "
,
header
=
[
0
],
comment
=
"#"
)
idx_keys
=
df
.
columns
[:
nr_row_indices
]
return
df
.
set_index
(
idx_keys
.
tolist
())
if
req_qoi
.
output_key
.
__eq__
(
"NoDataKeyOutputFile"
):
return
df
else
:
idx_keys
=
df
.
columns
[:
nr_row_indices
]
return
df
.
set_index
(
idx_keys
.
tolist
())
def
_add_parid2idx
(
self
,
df
,
par_id
):
# from https://stackoverflow.com/questions/14744068/prepend-a-level-to-a-pandas-multiindex
...
...
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