[1314] houi 절대값으로 변경
This commit is contained in:
parent
eb621b5cc5
commit
892e2acb45
@ -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];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user