Skip to content
Snippets Groups Projects
Unverified Commit d631f700 authored by BARBIER Marc's avatar BARBIER Marc
Browse files

Plusieurs petit patches

parent 248062c6
Branches master
No related tags found
No related merge requests found
No preview for this file type
......@@ -62,13 +62,10 @@ public class MltClusteringController extends AbstractController {
ResultModel[] results = HybridSoftClustering.runAsApi(args);
for(ResultModel result : results) {
System.out.println(Arrays.toString(result.clustering));
if(results.length == 0) {
return ResponseEntity.notFound().build();
}
if(results.length == 0) return ResponseEntity.ok("No solution found");
System.out.println("Found " + results.length + " possible combinaisons");
return ResponseEntity.ok(results);
return ResponseEntity.ok(results[results.length - 1]);
}
......
......@@ -18,6 +18,8 @@ import java.util.Optional;
import java.util.PriorityQueue;
import java.util.Random;
import java.util.Set;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
......@@ -263,7 +265,7 @@ public class PatternMiningController extends AbstractController{
//best performing lowest memory intensive way of searching the topk in an unordered list
PriorityQueue<Pair<Integer, String>> queue = new PriorityQueue<>(topkInt + 1 , (a, b) -> Integer.valueOf(a.getSecond()).compareTo(Integer.valueOf(b.getSecond())));
ListIterator<List<String>> it = patternsTable.getRows().listIterator();
ListIterator<List<String>> it = patternsTable.getRowsStartingFrom1().listIterator();
while(it.hasNext()) {
queue.add(new Pair<>(it.nextIndex() + 1, it.next().get(1)));
if (queue.size() > topkInt) {
......@@ -271,7 +273,7 @@ public class PatternMiningController extends AbstractController{
}
}
final List<Integer> topkIds = Arrays.asList((Integer[])queue.stream().map(Pair::getFirst).toArray());
final List<Integer> topkIds = queue.stream().map(Pair::getFirst).collect(Collectors.toList());
ResponseEntity<String> response = PatternUtils.filterPattern(currentItem, filename, (row, index) -> topkIds.contains(index));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment