Skip to content
Snippets Groups Projects
Commit cfe3fcfd authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

bugfix: adding groups to query

parent 8371f026
No related branches found
No related tags found
No related merge requests found
...@@ -156,8 +156,10 @@ public class VariablesApi { ...@@ -156,8 +156,10 @@ public class VariablesApi {
MiningQuery query = new MiningQuery(); MiningQuery query = new MiningQuery();
query.addVariable(new Variable(code)); query.addVariable(new Variable(code));
List<String> groupings = Arrays.asList(histogramGroupings.split(",")); List<String> newGroups = Arrays.asList(histogramGroupings.split(","));
query.getGrouping().addAll(groupings.stream().map(Variable::new).collect(Collectors.toList())); List<Variable> groupings = query.getGrouping();
groupings.addAll(newGroups.stream().map(Variable::new).collect(Collectors.toList()));
query.setGrouping(groupings);
query.setAlgorithm(new Algorithm("histograms", "Histograms", false)); query.setAlgorithm(new Algorithm("histograms", "Histograms", false));
return ResponseEntity.ok(histogramGroupings); return ResponseEntity.ok(histogramGroupings);
......
...@@ -6,6 +6,7 @@ import eu.hbp.mip.utils.TypesConvert; ...@@ -6,6 +6,7 @@ import eu.hbp.mip.utils.TypesConvert;
import scala.collection.JavaConverters; import scala.collection.JavaConverters;
import scala.collection.Seq; import scala.collection.Seq;
import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
...@@ -19,6 +20,12 @@ public class MiningQuery { ...@@ -19,6 +20,12 @@ public class MiningQuery {
private String filters; private String filters;
private Algorithm algorithm; private Algorithm algorithm;
public MiningQuery() {
this.variables = new LinkedList<>();
this.covariables = new LinkedList<>();
this.grouping = new LinkedList<>();
}
public List<Variable> getVariables() { public List<Variable> getVariables() {
return variables; return variables;
} }
...@@ -37,6 +44,8 @@ public class MiningQuery { ...@@ -37,6 +44,8 @@ public class MiningQuery {
this.covariables = covariables; this.covariables = covariables;
} }
public void addCovariable(Variable variable) { this.covariables.add(variable); }
public List<Variable> getGrouping() { public List<Variable> getGrouping() {
return grouping; return grouping;
} }
...@@ -45,6 +54,8 @@ public class MiningQuery { ...@@ -45,6 +54,8 @@ public class MiningQuery {
this.grouping = grouping; this.grouping = grouping;
} }
public void addGrouping(Variable variable) { this.grouping.add(variable); }
public String getFilters() { public String getFilters() {
return filters; return filters;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment