From 17ffabd3e7da275db7d387db3e8d64f80c680a3a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 11:13:46 +0800
Subject: [PATCH] 风向均值计算
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 960de0b..f49e3a9 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -161,8 +161,8 @@
}
size++;
- double sin = windSpeed * Math.sin(windDir / 180d) * Math.PI;
- double cos = windSpeed * Math.cos(windDir / 180d) * Math.PI;
+ double sin = windSpeed * Math.sin(windDir / 180d * Math.PI);
+ double cos = windSpeed * Math.cos(windDir / 180d * Math.PI);
sumSin += sin;
sumCos += cos;
}
@@ -174,7 +174,7 @@
double avgCos = sumCos / size;
if (avgSin > 0 && avgCos > 0) {
avgDir = Math.atan(avgSin / avgCos) * 180 / Math.PI;
- } else if ((avgSin > 0 && avgCos < 0) || (avgSin < 0 && avgCos < 0)) {
+ } else if (avgCos < 0) {
avgDir = Math.atan(avgSin / avgCos) * 180 / Math.PI + 180;
} else {
avgDir = Math.atan(avgSin / avgCos) * 180 / Math.PI + 360;
--
Gitblit v1.8.0