From 892e2acb45750dacc96d64d5ce4dc56933f26f88 Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 15 Dec 2025 16:18:10 +0900 Subject: [PATCH] =?UTF-8?q?[1314]=20houi=20=EC=A0=88=EB=8C=80=EA=B0=92?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/pwrGnrSimulation/PwrGnrSimService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java index 275046df..0c4325e3 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java @@ -867,11 +867,11 @@ public class PwrGnrSimService { // houi[rad]을 [도]로 변환 houi = (houi / (2 * Math.PI)) * 360; - // 電力ピークカット + // 電力ピークカット(houi 절대값으로 변경) double watt_peakcut_result = - ((matrix_multiply1 * (Math.cos(houi * Math.PI / 180) + 1) + matrix_multiply2) < 0.1) + ((matrix_multiply1 * (Math.cos(Math.abs(houi) * Math.PI / 180) + 1) + matrix_multiply2) < 0.1) ? 0.1 - : (matrix_multiply1 * (Math.cos(houi * Math.PI / 180) + 1) + matrix_multiply2); + : (matrix_multiply1 * (Math.cos(Math.abs(houi) * Math.PI / 180) + 1) + matrix_multiply2); //////////// // pcs1과 모듈 1의 전류차 구하기 용도 @@ -1869,20 +1869,20 @@ public class PwrGnrSimService { // + Math.cos(taiyousekii[i]) * Math.sin(koubai) * Math.sin(houi) * // Math.sin(jikakudo[i][j]))); // System.err.println( " " ); - + //houi 절대값으로 변경 cosTheta[m][j] = Math.max( 0, (Math.sin(latlng[i][0]) * Math.cos(koubai) - - Math.cos(latlng[i][0]) * Math.sin(koubai) * Math.cos(houi)) + - Math.cos(latlng[i][0]) * Math.sin(koubai) * Math.cos(Math.abs(houi))) * Math.sin(taiyousekii[i]) + (Math.cos(latlng[i][0]) * Math.cos(koubai) - + Math.sin(latlng[i][0]) * Math.sin(koubai) * Math.cos(houi)) + + Math.sin(latlng[i][0]) * Math.sin(koubai) * Math.cos(Math.abs(houi))) * Math.cos(taiyousekii[i]) * Math.cos(jikakudo[i][j]) + Math.cos(taiyousekii[i]) * Math.sin(koubai) - * Math.sin(houi) + * Math.sin(Math.abs(houi)) * Math.sin(jikakudo[i][j])); rb[m][j] = (cosThetaZ[i][j] == 0) ? 0 : cosTheta[m][j] / cosThetaZ[i][j];