Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Christian Fischer Pedersen
AIR
Commits
c0731574
Commit
c0731574
authored
Dec 17, 2021
by
Christian Marius Lillelund
Browse files
changed a name and fixed a ref
parent
e223e5f4
Pipeline
#99923
failed with stage
in 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ml/src/data/make_
survival
_data.py
→
ml/src/data/make_
alarm
_data.py
View file @
c0731574
File moved
ml/src/tools/inputter.py
View file @
c0731574
...
...
@@ -8,7 +8,7 @@ from typing import Tuple
import
pandas
as
pd
import
numpy
as
np
from
pandas._libs.tslibs
import
Timestamp
from
utility
import
d
ata
from
utility
.data
import
D
ata
def
get_ats
(
df
:
pd
.
DataFrame
,
end_date
:
Timestamp
,
settings
:
dict
)
->
str
:
"""
...
...
@@ -78,7 +78,7 @@ def get_gender(sc: pd.DataFrame) -> int:
return
0
return
1
def
get_citizen_data
(
data
:
data
.
Data
,
citizen_id
:
str
)
->
data
.
Data
:
def
get_citizen_data
(
data
:
Data
,
citizen_id
:
str
)
->
Data
:
"""
This method extracts all screening data we have on a citizen
:param data: a data DTO consisting of screening data of all citizens
...
...
@@ -90,8 +90,8 @@ def get_citizen_data(data: data.Data, citizen_id: str) -> data.Data:
training_done
=
data
.
td
.
loc
[
data
.
td
[
'CitizenId'
]
==
str
(
citizen_id
)]
training_cancelled
=
data
.
tc
.
loc
[
data
.
tc
[
'CitizenId'
]
==
str
(
citizen_id
)]
ats
=
data
.
ats
.
loc
[
data
.
ats
[
'CitizenId'
]
==
str
(
citizen_id
)]
citizen_data
=
data
.
Data
(
screening_content
,
status_set
,
training_done
,
training_cancelled
,
ats
)
citizen_data
=
Data
(
screening_content
,
status_set
,
training_done
,
training_cancelled
,
ats
)
return
citizen_data
def
get_screening_data
(
td
:
pd
.
DataFrame
,
tc
:
pd
.
DataFrame
,
...
...
Write
Preview
Supports
Markdown
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