|
|
@@ -655,14 +655,14 @@ public class UserChannelContext {
|
|
|
|
|
|
//根据完整度取部分有效信号
|
|
|
int elementSize = chunkAnalysisList.size() * hardLevel.getIntegrityRange() / 100;
|
|
|
- chunkAnalysisList = chunkAnalysisList.subList(0, elementSize);
|
|
|
+ List<ChunkAnalysis> chunkList = chunkAnalysisList.subList(0, elementSize);
|
|
|
|
|
|
- if(chunkAnalysisList == null || chunkAnalysisList.size() == 0){
|
|
|
+ if(chunkList == null || chunkList.size() == 0){
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
if (musicXmlNote.getFrequency() == -1) {// 休止符
|
|
|
- return chunkAnalysisList.stream().filter(t -> t.getFrequency() > 100).count() <= 1;
|
|
|
+ return chunkList.stream().filter(t -> t.getFrequency() > 100).count() <= 1;
|
|
|
}
|
|
|
|
|
|
ChunkAnalysis firstChunkAnalysis = chunkAnalysisList.get(0);
|
|
|
@@ -678,11 +678,11 @@ public class UserChannelContext {
|
|
|
lastChunkAnalysis = new ChunkAnalysis(0, 0, -1, 0, 0, 0);
|
|
|
}
|
|
|
|
|
|
- List<ChunkAnalysis> chunkList = new ArrayList<ChunkAnalysis>(chunkAnalysisList);
|
|
|
+ /*List<ChunkAnalysis> chunkList = new ArrayList<ChunkAnalysis>(chunkAnalysisList);
|
|
|
|
|
|
if(chunkList.size() == 0){
|
|
|
return false;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
NoteFrequencyRange noteFrequencyRange = null;
|
|
|
ChunkAnalysis chunkAnalysis = null;
|
|
|
@@ -733,7 +733,9 @@ public class UserChannelContext {
|
|
|
//判断是否与上一个音延续下来的
|
|
|
if(firstChunkAnalysis.getFrequency() > 100 && lastChunkAnalysis.getFrequency() > 100){
|
|
|
tempo = new NoteFrequencyRange(standardFrequecy, firstChunkAnalysis.getFrequency()).equals(new NoteFrequencyRange(standardFrequecy, lastChunkAnalysis.getFrequency())) == false;
|
|
|
- LOGGER.info("节奏错误原因：上一个音延续下来导致的");
|
|
|
+ if(tempo == false){
|
|
|
+ LOGGER.info("节奏错误原因：上一个音延续下来导致的");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
yonge