|
@@ -890,7 +890,7 @@ public class UserChannelContext {
|
|
return chunkList.stream().filter(t -> t.getAmplitude() > hardLevel.getAmplitudeThreshold()).count() <= 0;
|
|
return chunkList.stream().filter(t -> t.getAmplitude() > hardLevel.getAmplitudeThreshold()).count() <= 0;
|
|
}
|
|
}
|
|
|
|
|
|
- Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).reduce((first, second) -> second);
|
|
|
|
|
|
+ Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).findFirst();
|
|
|
|
|
|
ChunkAnalysis lastChunkAnalysis = null;
|
|
ChunkAnalysis lastChunkAnalysis = null;
|
|
if (chunkAnalysisOptional.isPresent()) {
|
|
if (chunkAnalysisOptional.isPresent()) {
|
|
@@ -914,12 +914,12 @@ public class UserChannelContext {
|
|
int peakSize = 0;
|
|
int peakSize = 0;
|
|
|
|
|
|
for (int i = 1; i < chunkAmplitudeList.size(); i++) {
|
|
for (int i = 1; i < chunkAmplitudeList.size(); i++) {
|
|
- if (chunkAmplitudeList.get(i - 1) + 3 >= chunkAmplitudeList.get(i)) {
|
|
|
|
|
|
+ if (chunkAmplitudeList.get(i - 1) + hardLevel.getAmplitudeThreshold() >= chunkAmplitudeList.get(i)) {
|
|
isContinue = false;
|
|
isContinue = false;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
- if(isContinue == false && chunkAmplitudeList.get(i - 1) + 3 < chunkAmplitudeList.get(i)){
|
|
|
|
|
|
+ if(isContinue == false && chunkAmplitudeList.get(i - 1) + hardLevel.getAmplitudeThreshold() < chunkAmplitudeList.get(i)){
|
|
isContinue = true;
|
|
isContinue = true;
|
|
peakSize++;
|
|
peakSize++;
|
|
|
|
|