Merge pull request LREN-CHUV#43 from LREN-CHUV/fix-numeric-parameters

fix numeric parameters

Author: ludovicc

python-sgd-regression/sgd_regression.py

@@ -187,6 +187,16 @@ def _parse_parameters(parameters):
                 raise errors.UserError('Wrong format {} for hidden_layer_sizes'.format(value))
             parameters[name] = values
 
+        else:
+            # try converting it to float or integer if possible
+            try:
+                value = float(value)
+                if value == round(value):
+                    value = int(value)
+                parameters[name] = value
+            except ValueError:
+                pass
+
     return parameters
 
 

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

@@ -82,7 +82,8 @@ services:
       PARAM_covariables: "minimentalstate,opticchiasm,subjectageyears"
       PARAM_grouping: ""
       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\"}}"
-      MODEL_PARAM_type: "gradient_boosting"
+      MODEL_PARAM_type: "linear_model"
+      MODEL_PARAM_alpha: 0.25
 
   sgd-regression-a:
     extends: sgd-regression-base

python-sgd-regression/tests/unit/test_sgd_regression.py

@@ -138,4 +138,15 @@ def test_deserialize_sklearn_estimator():
 
 def test_parse_parameters():
     assert _parse_parameters({'class_prior': '0.5, 0.5'}) == {'class_prior': [0.5, 0.5]}
+    assert _parse_parameters({'class_prior': '1.'}) == {'class_prior': [1]}
+    assert _parse_parameters({'class_prior': '1'}) == {'class_prior': [1]}
     assert _parse_parameters({'hidden_layer_sizes': '10, 50, 10'}) == {'hidden_layer_sizes': [10, 50, 10]}
+    assert _parse_parameters({
+        'alpha': '0.05',
+        'max_depth': '3',
+        'penalty': 'l1'
+    }) == {
+        'alpha': 0.05,
+        'max_depth': 3,
+        'penalty': 'l1'
+    }