From 7b8758054b52e369710e8625d893eec8293ab166 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期四, 01 十二月 2022 10:40:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
src/main/java/com/whyc/util/MathUtil.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/util/MathUtil.java b/src/main/java/com/whyc/util/MathUtil.java
index 000a873..e264d88 100644
--- a/src/main/java/com/whyc/util/MathUtil.java
+++ b/src/main/java/com/whyc/util/MathUtil.java
@@ -25,23 +25,33 @@
double 蟽 = Math.sqrt(s.doubleValue());
return BigDecimal.valueOf(蟽).setScale(4, RoundingMode.HALF_UP).floatValue();
}
- //璇勫垽鏁寸粍鐨勫ソ鍧廸lag:1 鐢靛帇锛� 2 鍐呴樆锛�3 杩炴帴鏉�
- public static String getJudge(float minStd, float std, TestParam testParam){
- String judge="鏈煡";
+ //璇勫垽鏁寸粍鐨勫ソ鍧廸lag:1宸紝2鑹紝3浼� 鐢靛帇锛� 鍐呴樆瓒婂ぇ瓒婁笉濂�
+ public static int getflag(float maxStd, float std, TestParam testParam){
+ int flag=0;
float judgeStdLow=0f;
float judgeStdHigh=0f;
- minStd=minStd*100;
+ maxStd=maxStd*100;
if (testParam!=null){
judgeStdLow=std*testParam.getResGoodCoeK3();
judgeStdHigh=std*testParam.getResBadCoeK4();
- if(minStd<=judgeStdLow){
- judge="宸�";
- }else if(minStd<=judgeStdHigh){
- judge="鑹�";
+ if(maxStd>=judgeStdHigh){
+ flag=1;//"宸�"
+ }else if(maxStd>=judgeStdLow){
+ flag=2;//"鑹�";
}else{
- judge="浼�";
+ flag=3;//"浼�";
}
}
+ return flag;
+ }
+ //璇勫垽鏁寸粍鐨勫ソ鍧廸lag:1 鐢靛帇锛� 鍐呴樆瓒婂ぇ瓒婁笉濂�
+ public static String getJudge(int flag){
+ String judge="鏈煡";
+ switch (flag){
+ case 1:judge="宸�";break;
+ case 2:judge="鑹�";break;
+ case 3:judge="浼�";break;
+ }
return judge;
}
--
Gitblit v1.9.1