...
 
Commits (2)
[bumpversion]
current_version = 1.2.2
current_version = 1.2.3
commit = True
tag = True
......
......@@ -13,7 +13,7 @@ services:
image: rabbitmq:alpine
restart: always
app:
image: sherzinger/fractalis:1.2.2
image: sherzinger/fractalis:1.2.3
volumes:
- ./config/fractalis/config.py:/config.py
- ./config/fractalis/logging.yaml:/logging.yaml
......@@ -27,7 +27,7 @@ services:
- redis
- rabbitmq
worker:
image: sherzinger/fractalis:1.2.2
image: sherzinger/fractalis:1.2.3
volumes:
- ./config/fractalis/config.py:/config.py
- ./config/fractalis/logging.yaml:/logging.yaml
......
......@@ -58,7 +58,7 @@ class SurvivalTask(AnalyticTask):
if event_observed:
# find observation boolean value for every duration
E = event_observed[0].merge(sub_df, how='right', on='id')
E = [bool(x) and not np.isnan(x) for x in E['value']]
E = [not x for x in pd.isnull(E['value_x'])]
assert len(E) == len(T)
if estimator == 'NelsonAalen':
fitter = NelsonAalenFitter()
......
......@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
@misc_blueprint.route('/version', methods=['GET'])
def get_version() -> Tuple[Response, int]:
version = '1.2.2'
version = '1.2.3'
# this is a good place to launch the janitor because /version is one of the
# first requests sent by the front-end on initialization
janitor.delay()
......
......@@ -9,7 +9,7 @@ setup(
author='Sascha Herzinger',
author_email='sascha.herzinger@uni.lu',
url='https://git-r3lab.uni.lu/Fractalis/fractalis',
version='1.2.2',
version='1.2.3',
license='Apache2.0',
include_package_data=True,
python_requires='>=3.6.0',
......
......@@ -37,8 +37,11 @@ class TestSurvivalTask:
duration.columns.values[2] = 'value'
event_observed = df[['id', 'E']].copy()
event_observed.insert(1, 'feature', 'was_observed')
event_observed.columns.values[2] = 'value'
event_observed = event_observed[event_observed['value'] == 1]
categories = df[['id', 'group']].copy()
categories.insert(1, 'feature', 'group')
categories.columns.values[2] = 'value'
results = self.task.main(durations=[duration],
categories=[categories],
event_observed=[event_observed],
......