From 276c5be1eb5613f3f670460c805097e4eda8323c Mon Sep 17 00:00:00 2001
From: cha <yscha@interplug.co.kr>
Date: Fri, 13 Jun 2025 13:14:28 +0900
Subject: [PATCH] =?UTF-8?q?[1090]=20=EB=B0=9C=EC=A0=84=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20peakcut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pwrGnrSimulation/PwrGnrSimService.java    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 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 c75fd2dc..5d4ff4c0 100644
--- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
+++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
@@ -476,17 +476,15 @@ public class PwrGnrSimService {
             hatsudenryou_peakcut_all[j] += hatsudenryou_peakcut[i][j];
           }
 
-          hatsudenryou_all_snow[j] =
-              (int)
-                  Math.round(hatsudenryou_all[j] * (1 - (snow[(simulationPointNumber * 12) + j])));
-          hatsudenryou_peakcut_all_snow[j] =
-              (int)
-                  Math.round(
-                      hatsudenryou_peakcut_all[j] * (1 - (snow[(simulationPointNumber * 12) + j])));
+          hatsudenryou_all_snow[j] = hatsudenryou_all[j] * (1 - (snow[(simulationPointNumber * 12) + j]));
+          hatsudenryou_peakcut_all_snow[j] = hatsudenryou_peakcut_all[j] * (1 - (snow[(simulationPointNumber * 12) + j]));
 
           // 계산 후 반올림 처리
           hatsudenryou_all[j] = (int) Math.round(hatsudenryou_all[j]);
           hatsudenryou_peakcut_all[j] = (int) Math.round(hatsudenryou_peakcut_all[j]);
+          hatsudenryou_all_snow[j] = (int)Math.round(hatsudenryou_all_snow[j]);
+          hatsudenryou_peakcut_all_snow[j] =(int) Math.round(hatsudenryou_peakcut_all_snow[j]);
+
         }
       }
 
@@ -499,7 +497,7 @@ public class PwrGnrSimService {
 
     // 결과 확인용
    //System.err.println("hatsudenryou_all 결과 ::: " + Arrays.toString(hatsudenryou_all));
-    log.debug("hatsudenryou_all ::: " + Arrays.toString(hatsudenryou_all));
+   // log.debug("hatsudenryou_all ::: " + Arrays.toString(hatsudenryou_all));
 
     //    System.err.println("hatsudenryou_all_snow 결과 ::: " +
     // Arrays.toString(hatsudenryou_all_snow));
@@ -546,8 +544,8 @@ public class PwrGnrSimService {
     double watt_peakcut_about_deg90 =
         computePowerPeakCutDeg90(simulationPointNumber, sekisairitsu, koubai);
 
-    double matrix_multiply1 = (1 * watt_peakcut_about_deg90) + (-1 * watt_peakcut_about_deg90);
-    double matrix_multiply2 = (-1 * watt_peakcut_about_deg90) + (2 * watt_peakcut_about_deg90);
+    double matrix_multiply1 = (1 * wattPeakcutAboutDeg0) + (-1 * watt_peakcut_about_deg90);
+    double matrix_multiply2 = (-1 * wattPeakcutAboutDeg0) + (2 * watt_peakcut_about_deg90);
 
     // houi[rad]을 [도]로 변환
     houi = (houi / (2 * Math.PI)) * 360;
@@ -607,8 +605,8 @@ public class PwrGnrSimService {
       double peakcutByPcsResult = peakcutByPcsKijun - peakcutByPcs;
 
       watt_peakcut_result =
-          ((100 - wattPeakcutAboutDeg0 + peakcutByPcsResult) / 100 < 1)
-              ? ((100 - wattPeakcutAboutDeg0 + peakcutByPcsResult) / 100)
+          ((100 - watt_peakcut_result + peakcutByPcsResult) / 100 < 1)
+              ? ((100 - watt_peakcut_result + peakcutByPcsResult) / 100)
               : 1.0;
     } else {
       watt_peakcut_result = 1.0;