|
|
@@ -254,7 +254,7 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
|
|
|
//音准匹配数量
|
|
|
float intonationNum = 0;
|
|
|
//音准匹配误差范围
|
|
|
- float intonationErrRange = 1;
|
|
|
+ float intonationErrRange = 3;
|
|
|
//音准有效阈值
|
|
|
float intonationValidDuty = 0.7f;
|
|
|
|
|
|
@@ -397,7 +397,8 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
|
|
|
header.put("commond", command);
|
|
|
webSocketInfo.setHeader(header);
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- BigDecimal score = intonation.multiply(new BigDecimal(0.5)).add(cadence.multiply(new BigDecimal(0.5))).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
+// BigDecimal score = intonation.multiply(new BigDecimal(0.5)).add(cadence.multiply(new BigDecimal(0.5))).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal score = intonation.setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
result.put("score", score);
|
|
|
result.put("intonation", intonation);
|
|
|
result.put("cadence", cadence);
|