dev #84
@ -476,17 +476,15 @@ public class PwrGnrSimService {
|
|||||||
hatsudenryou_peakcut_all[j] += hatsudenryou_peakcut[i][j];
|
hatsudenryou_peakcut_all[j] += hatsudenryou_peakcut[i][j];
|
||||||
}
|
}
|
||||||
|
|
||||||
hatsudenryou_all_snow[j] =
|
hatsudenryou_all_snow[j] = hatsudenryou_all[j] * (1 - (snow[(simulationPointNumber * 12) + j]));
|
||||||
(int)
|
hatsudenryou_peakcut_all_snow[j] = hatsudenryou_peakcut_all[j] * (1 - (snow[(simulationPointNumber * 12) + j]));
|
||||||
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[j] = (int) Math.round(hatsudenryou_all[j]);
|
hatsudenryou_all[j] = (int) Math.round(hatsudenryou_all[j]);
|
||||||
hatsudenryou_peakcut_all[j] = (int) Math.round(hatsudenryou_peakcut_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));
|
//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 결과 ::: " +
|
// System.err.println("hatsudenryou_all_snow 결과 ::: " +
|
||||||
// Arrays.toString(hatsudenryou_all_snow));
|
// Arrays.toString(hatsudenryou_all_snow));
|
||||||
@ -546,8 +544,8 @@ public class PwrGnrSimService {
|
|||||||
double watt_peakcut_about_deg90 =
|
double watt_peakcut_about_deg90 =
|
||||||
computePowerPeakCutDeg90(simulationPointNumber, sekisairitsu, koubai);
|
computePowerPeakCutDeg90(simulationPointNumber, sekisairitsu, koubai);
|
||||||
|
|
||||||
double matrix_multiply1 = (1 * watt_peakcut_about_deg90) + (-1 * watt_peakcut_about_deg90);
|
double matrix_multiply1 = (1 * wattPeakcutAboutDeg0) + (-1 * watt_peakcut_about_deg90);
|
||||||
double matrix_multiply2 = (-1 * watt_peakcut_about_deg90) + (2 * watt_peakcut_about_deg90);
|
double matrix_multiply2 = (-1 * wattPeakcutAboutDeg0) + (2 * watt_peakcut_about_deg90);
|
||||||
|
|
||||||
// houi[rad]을 [도]로 변환
|
// houi[rad]을 [도]로 변환
|
||||||
houi = (houi / (2 * Math.PI)) * 360;
|
houi = (houi / (2 * Math.PI)) * 360;
|
||||||
@ -607,8 +605,8 @@ public class PwrGnrSimService {
|
|||||||
double peakcutByPcsResult = peakcutByPcsKijun - peakcutByPcs;
|
double peakcutByPcsResult = peakcutByPcsKijun - peakcutByPcs;
|
||||||
|
|
||||||
watt_peakcut_result =
|
watt_peakcut_result =
|
||||||
((100 - wattPeakcutAboutDeg0 + peakcutByPcsResult) / 100 < 1)
|
((100 - watt_peakcut_result + peakcutByPcsResult) / 100 < 1)
|
||||||
? ((100 - wattPeakcutAboutDeg0 + peakcutByPcsResult) / 100)
|
? ((100 - watt_peakcut_result + peakcutByPcsResult) / 100)
|
||||||
: 1.0;
|
: 1.0;
|
||||||
} else {
|
} else {
|
||||||
watt_peakcut_result = 1.0;
|
watt_peakcut_result = 1.0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user