Merge branch '104-structure-candidate-sorting-is-not-consistent-betwe…

…en-fingerblastjjob-and-fingerblastsearchjjob' into 'master'

Resolve "structure candidate sorting is not consistent between FingerBlastJjob and FingerblastSearchJJob if CSI score is equal"

Closes #104

See merge request bright-giant/sirius/sirius-libs!66

web_service_oss/sirius_web_client/src/main/java/de/unijena/bioinf/fingerid/FingerblastSearchJJob.java

@@ -116,7 +116,8 @@ protected FingerblastResult compute() throws Exception {
         checkForInterruption();
         scoreJobs.forEach(this::submitSubJob);
         checkForInterruption();
-        scoredCandidates = scoreJobs.stream().flatMap(r -> r.takeResult().stream()).sorted(Comparator.reverseOrder()).map(fpc -> new Scored<>(fpc.getCandidate(), fpc.getScore())).collect(Collectors.toList());
+        //This sorting here needs to be consistent with the sorting everywhere else
+        scoredCandidates = scoreJobs.stream().flatMap(r -> r.takeResult().stream()).sorted(Comparator.<Scored<FingerprintCandidate>>reverseOrder().thenComparing((Scored<FingerprintCandidate> s) -> s.getCandidate().getInchiKey2D())).map(fpc -> new Scored<>(fpc.getCandidate(), fpc.getScore())).collect(Collectors.toList());
         checkForInterruption();
         scoredCandidates.forEach(sc -> postprocessCandidate(sc.getCandidate()));
         checkForInterruption();