From 89c85f06535616f9582b487ced1dcea129827865 Mon Sep 17 00:00:00 2001
From: kfilippopolitis <kostasfilippop@gmail.com>
Date: Wed, 16 Jun 2021 11:38:48 -0700
Subject: [PATCH] Added visualzation
---
.../eu/hbp/mip/models/DTOs/AlgorithmDTO.java | 4 +---
.../hbp/mip/services/ExperimentService.java | 20 ++++++++++++++-----
src/main/resources/application.yml | 2 +-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/AlgorithmDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/AlgorithmDTO.java
index 47e6f3ddf..2297ae9be 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/AlgorithmDTO.java
+++ b/src/main/java/eu/hbp/mip/models/DTOs/AlgorithmDTO.java
@@ -84,12 +84,10 @@ public class AlgorithmDTO {
inputData.setX(Arrays.asList(parameter.getValue().split(",")));
if(parameter.getName().equals("y"))
inputData.setY(Arrays.asList(parameter.getValue().split(",")));
- if(parameter.getName().equals("dataset"))
+ if(parameter.getName().equals("datasets"))
inputData.setDatasets(Arrays.asList(parameter.getValue().split(",")));
if(parameter.getName().equals("pathology"))
inputData.setPathology(parameter.getValue());
- if(parameter.getName().equals("filter"))
- inputData.setFilters(null);
});
mipEngineBody.setInputdata(inputData);
return mipEngineBody;
diff --git a/src/main/java/eu/hbp/mip/services/ExperimentService.java b/src/main/java/eu/hbp/mip/services/ExperimentService.java
index 0179d824e..bafa71d01 100644
--- a/src/main/java/eu/hbp/mip/services/ExperimentService.java
+++ b/src/main/java/eu/hbp/mip/services/ExperimentService.java
@@ -509,13 +509,22 @@ public class ExperimentService {
private List<Object> formattingMIPEngienResult(String result) {
List<List<String>> resultJson = JsonConverters.convertJsonStringToObject(result, new ArrayList<ArrayList<String>>().getClass());
- List<Object> finalObject = new ArrayList<>();
+ String schema_json = "{\"fields\":[{\"type\":\"string\",\"name\":\"node\"},{\"type\":\"number\",\"name\":\"row-id\"},{\"type\":\"number\",\"name\":\"alzheimerbroadcategory_bin\"}]}";
+ LinkedTreeMap<String,List<Object>> schema = JsonConverters.convertJsonStringToObject(schema_json, new LinkedTreeMap<String,ArrayList<Object>>().getClass());
+
+
+ LinkedTreeMap<String,Object> data_data = new LinkedTreeMap<>();
+ data_data.put("data", resultJson);
+ data_data.put("profile", "tabular-data-resource");
+ data_data.put("schema", schema);
+ data_data.put("name","Logistic Regression Stuff");
+
LinkedTreeMap<String,Object> data = new LinkedTreeMap<>();
- data.put("data", resultJson);
- data.put("type", "application/json");
+ data.put("data", data_data);
+ data.put("type", "application/vnd.dataresource+json");
+ List<Object> finalObject = new ArrayList<>();
finalObject.add(data);
- List<Object> result_kappa = finalObject;
- return result_kappa;
+ return finalObject;
}
/**
@@ -592,6 +601,7 @@ public class ExperimentService {
} catch (Exception e) {
throw new InternalServerError("Error occurred : " + e.getMessage());
}
+ System.out.println(results);
// Results are stored in the experiment object
List<Object> resultDTOS = formattingMIPEngienResult(String.valueOf(results));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d8d542b6b..660671108 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@ logging:
### AUTHENTICATION ###
authentication:
- enabled: false
+ enabled: true
### DATABASE CONFIGURATION ###
--
GitLab