Merge pull request #285 from madgik/dev/3c

Fix 3C
madgik · Sep 29, 2020 · 02836ae · 02836ae
2 parents 4a0df12 + ac691eb
commit 02836ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Exareme-Docker/src/mip-algorithms/THREE_C/properties.json b/Exareme-Docker/src/mip-algorithms/THREE_C/properties.json
@@ -12,7 +12,7 @@
             "type": "column",
             "columnValuesSQLType": "real, integer, text",
             "columnValuesIsCategorical": "",
-            "value": "lefthippocampus",
+            "value": "lefthippocampus, righthippocampus, leftcaudate",
             "valueNotBlank": true,
             "valueMultiple": true,
             "valueType": "string"
@@ -24,7 +24,7 @@
             "type": "column",
             "columnValuesSQLType": "real, integer, text",
             "columnValuesIsCategorical": "",
-            "value": "righthippocampus",
+            "value": "apoe4, gender, agegroup",
             "valueNotBlank": true,
             "valueMultiple": true,
             "valueType": "string"
@@ -61,7 +61,7 @@
         },
         {
             "name": "dx",
-            "label": "DX",
+            "label": "dx",
             "desc": "Diagnosis.",
             "type": "other",
             "value": "alzheimerbroadcategory",
@@ -71,7 +71,7 @@
         },
         {
             "name": "c2_feature_selection_method",
-            "label": "C2: Feature selection method",
+            "label": "c2_feature_selection_method",
             "desc": "",
             "type": "other",
             "value": "RF",
@@ -88,7 +88,7 @@
         },
         {
             "name": "c2_num_clusters_method",
-            "label": "C2: Number of clusters method",
+            "label": "c2_num_clusters_method",
             "desc": "",
             "type": "other",
             "value": "Euclidean",
@@ -105,7 +105,7 @@
         },
         {
             "name": "c2_num_clusters",
-            "label": "C2: Number of clusters",
+            "label": "c2_num_clusters",
             "desc": "",
             "type": "other",
             "value": "6",
@@ -117,7 +117,7 @@
         },
         {
             "name": "c2_clustering_method",
-            "label": "C2: Clustering method",
+            "label": "c2_clustering_method",
             "desc": "",
             "type": "other",
             "value": "Euclidean",
@@ -134,7 +134,7 @@
         },
         {
             "name": "c3_feature_selection_method",
-            "label": "C3: Feature selection method",
+            "label": "c3_feature_selection_method",
             "desc": "",
             "type": "other",
             "value": "RF",
@@ -151,7 +151,7 @@
         },
         {
             "name": "c3_classification_method",
-            "label": "C3: Classification method",
+            "label": "c3_classification_method",
             "desc": "",
             "type": "other",
             "value": "RF",

diff --git a/Exareme-Docker/src/mip-algorithms/THREE_C/threec.py b/Exareme-Docker/src/mip-algorithms/THREE_C/threec.py
@@ -97,7 +97,7 @@ def local_pure(self):
 
         table_out = TabularDataResource(
             fields=[str(i + 1) for i in range(len(res))],
-            data=[tuple(res)],
+            data=tuple(res),
             title="3C result",
         )
         self.result = AlgorithmResult(
@@ -1226,11 +1226,11 @@ def rdef_cart_function():
         "-y",
         "lefthippocampus, righthippocampus, leftcaudate",
         "-x",
-        "apoe4, gender, agegroup",
+        "gender, agegroup",
         "-pathology",
         "dementia",
         "-dataset",
-        "adni",
+        "edsd, ppmi",
         "-filter",
         "",
         "-dx",
@@ -1240,7 +1240,7 @@ def rdef_cart_function():
         "-c2_num_clusters_method",
         "Euclidean",
         "-c2_num_clusters",
-        "5",
+        "6",
         "-c2_clustering_method",
         "Euclidean",
         "-c3_feature_selection_method",