更新BOLL算法

wangyiqian · Aug 31, 2022 · ad2f169 · ad2f169
1 parent 4b27618
commit ad2f169
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/lib/src/main/java/com/github/wangyiqian/stockchart/index/BollCalculator.kt b/lib/src/main/java/com/github/wangyiqian/stockchart/index/BollCalculator.kt
@@ -57,24 +57,19 @@ object BollCalculator: ICalculator {
 
             sum += kEntity.getClosePrice()
 
-            if (pEnd - pFrom + 1 == n) {
-                val ma = sum / n
-                result[mbIdx][kEntityIdx] = ma
+            var ma = sum / (pEnd - pFrom + 1)
+            result[mbIdx][kEntityIdx] = ma
+            if(pEnd - pFrom + 1 == n){
                 sum -= input[pFrom].getClosePrice()
                 pFrom += 1
-
-                var squareSum = 0f
-                for (i in pEnd downTo pEnd - n + 1) {
-                    squareSum += (input[i].getClosePrice() - ma).pow(2)
-                }
-                val std = sqrt(squareSum / n)
-                result[upIdx][kEntityIdx] = ma + k * std
-                result[dnIdx][kEntityIdx] = ma - k * std
-            } else {
-                result[mbIdx][kEntityIdx] = null
-                result[upIdx][kEntityIdx] = null
-                result[dnIdx][kEntityIdx] = null
             }
+            var squareSum = 0f
+            for (i in pEnd downTo pFrom) {
+                squareSum += (input[i].getClosePrice() - ma).pow(2)
+            }
+            val std = sqrt(squareSum / n)
+            result[upIdx][kEntityIdx] = ma + k * std
+            result[dnIdx][kEntityIdx] = ma - k * std
         }
         return result
     }