一厂泵功图计算修改

src/main/java/com/gct/aoid/algorithm/CalPumpCard.java

@@ -1,6 +1,5 @@
 package com.gct.aoid.algorithm;
 
-import com.alibaba.fastjson.JSONObject;
 import com.gct.aoid.entity.DiagramCardBaseParam;
 import com.gct.aoid.entity.SingleDiagramDiagnoseResult;
 import com.gct.common.util.SGTUtil;
@@ -201,42 +200,26 @@ public class CalPumpCard {
         //ProcessParam2 pp2 = new ProcessParam2(); //Commented by lloyd 2021.1.30
         double tmpDownLevel = 0.001;
         double tmpUpLevel = 0, downLoadingLevel = 0, upLoadingLevel = 0;
-        int tmpANNNum = 0;
         if (isLegal != 1) return null;//功图不合法不能计算
 
         Double[][] cardArray = SGTUtil.diagramReverse(sgt);
-
-        while (tmpANNNum == 0) {
-            boolean flag = false;
-            for (int i = 0; i < sgt.length / 2; i++) {
-                if (cardArray[0][i] <= S * tmpDownLevel) {
-                    tmpANNNum++;
-                    downLoadingLevel += cardArray[1][i];
-                    flag = true;
-                    break;
-                }
+        double minS = 999999, maxS = -999999;
+        for (Double[] point : sgt) {
+            if (point[0] > maxS) maxS = point[0];
+            if (point[0] < minS) minS = point[0];
+        }
+        int downNum = 0, upNum = 0;
+        for (Double[] point : sgt) {
+            if (point[0] <= minS * 1.001) {
+                downLoadingLevel = (downLoadingLevel * downNum + point[1]) / (downNum + 1);
+                downNum++;
             }
-            if (tmpANNNum == 0 && !flag) {
-                log.error("泵功图无法计算::==>params:sgt={},S={},isLegal={},N={},result2={}", JSONObject.toJSONString(sgt),
-                        S,isLegal,N,result2);
-                return null;
+            if (point[0] >= maxS * 0.98) {
+                upLoadingLevel = (upLoadingLevel * upNum + point[1]) / (upNum + 1);
+                upNum++;
             }
-            tmpDownLevel += 0.001;
         }
 
-        downLoadingLevel = downLoadingLevel / tmpANNNum;
-        tmpANNNum = 0;
-        tmpUpLevel = 0.98;
-        while (tmpANNNum == 0) {
-            for (int i = 0; i < sgt.length; i++) {
-                if (cardArray[0][i] >= S * tmpUpLevel) {
-                    tmpANNNum++;
-                    upLoadingLevel = upLoadingLevel + cardArray[1][i];
-                }
-            }
-            tmpUpLevel = tmpUpLevel - 0.001;
-        }
-        upLoadingLevel /= tmpANNNum;
         double[] tmpdDMWY = new double[sgt.length];
         double[] tmpdDMYeZH = new double[sgt.length];
         Double[][] DBU;