Skip to content

Commit e3e0d82

Browse files
committed
fix empty string in class_prior
1 parent 740e396 commit e3e0d82

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

python-sgd-regression/sgd_regression.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,24 +174,36 @@ def _parse_parameters(parameters):
174174
if name == 'class_prior':
175175
if value is not None:
176176
value = str(value).strip()
177-
if value != '':
177+
if value == '':
178+
values = None
179+
else:
178180
try:
179181
values = [float(v) for v in value.replace(' ', '').split(',')]
180182
except ValueError:
181183
raise errors.UserError('Wrong format {} for class_prior'.format(value))
182184
if sum(values) != 1:
183185
raise errors.UserError('Values in class_prior must sum to 1 ({} given)'.format(values))
184-
parameters[name] = values
186+
else:
187+
values = None
188+
189+
parameters[name] = values
185190

186191
elif name == 'hidden_layer_sizes':
187192
if value is not None:
188193
value = str(value).strip()
189-
if value != '':
194+
if value == '':
195+
# default value
196+
values = (100, )
197+
else:
190198
try:
191199
values = [int(v) for v in value.replace(' ', '').split(',')]
192200
except ValueError:
193201
raise errors.UserError('Wrong format {} for hidden_layer_sizes'.format(value))
194-
parameters[name] = values
202+
else:
203+
# default
204+
values = (100, )
205+
206+
parameters[name] = values
195207

196208
else:
197209
# try converting it to float or integer if possible

python-sgd-regression/tests/docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ services:
8282
PARAM_covariables: "minimentalstate,opticchiasm,subjectageyears"
8383
PARAM_grouping: ""
8484
PARAM_meta: "{\"lefthippocampus\":{\"code\":\"lefthippocampus\",\"type\":\"real\",\"mean\":3.0,\"std\":0.35,\"minValue\":0.1,\"maxValue\":5.0},\"minimentalstate\":{\"code\":\"minimentalstate\",\"type\":\"real\",\"mean\":24.0,\"std\":5.0},\"opticchiasm\":{\"code\":\"opticchiasm\",\"type\":\"real\",\"mean\":0.08,\"std\":0.009},\"subjectage\":{\"code\":\"subjectage\",\"type\":\"real\",\"mean\":71.0,\"std\":8.0}, \"rs17125944_c\": {\"code\": \"rs17125944_c\",\"enumerations\": [{\"code\": 0,\"label\": 0},{\"code\": 1,\"label\": 1},{\"code\": 2,\"label\": 2}],\"sql_type\": \"int\",\"type\": \"polynominal\"}, \"adnicategory\": {\"code\": \"adnicategory\", \"enumerations\": [{\"code\": \"AD\", \"label\": \"Alzheimer's Disease\"}, {\"code\": \"MCI\", \"label\": \"Mild Cognitive Impairment\"}, {\"code\": \"CN\", \"label\": \"Cognitively Normal\"}], \"type\": \"polynominal\"}, \"alzheimerbroadcategory\": {\"code\": \"alzheimerbroadcategory\", \"enumerations\": [{\"code\": \"AD\", \"label\": \"Alzheimer's disease\"}, {\"code\": \"CN\", \"label\": \"Cognitively Normal\"}, {\"code\": \"Other\", \"label\": \"Other\"}], \"type\": \"polynominal\"}, \"subjectageyears\": {\"code\": \"subjectageyears\", \"label\": \"Age Years\", \"maxValue\": 130, \"minValue\": 0, \"type\": \"integer\"}}"
85-
MODEL_PARAM_type: "linear_model"
86-
MODEL_PARAM_alpha: 0.25
85+
MODEL_PARAM_type: "naive_bayes"
86+
MODEL_PARAM_class_prior: ""
87+
MODEL_PARAM_alpha: 1
8788

8889
sgd-regression-a:
8990
extends: sgd-regression-base

0 commit comments

Comments
 (0)