qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #265

Merged
ysCha merged 2 commits from dev into prd-deploy 2025-12-15 16:43:28 +09:00
Conversation 0 Commits 2 Files Changed 2 +10 -7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/interplug/qcast/biz/master/dto/roofmaterial/ApiRoofMaterialResponse.java
View File

@ -41,4 +41,7 @@ public class ApiRoofMaterialResponse {
@Schema(description = "서까래 기본 수치") @Schema(description = "서까래 기본 수치")
private String raftBaseCd; private String raftBaseCd;
@Schema(description = "경사도 기본 수치")
private String inclBase;
} }

14
src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
View File

@ -867,11 +867,11 @@ public class PwrGnrSimService {
// houi[rad]을 [도]로 변환 // houi[rad]을 [도]로 변환
houi = (houi / (2 * Math.PI)) * 360; houi = (houi / (2 * Math.PI)) * 360;
// 電力ピークカット // 電力ピークカット(houi 절대값으로 변경)
double watt_peakcut_result = 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 ? 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의 전류차 구하기 용도 // pcs1과 모듈 1의 전류차 구하기 용도
@ -1869,20 +1869,20 @@ public class PwrGnrSimService {
// + Math.cos(taiyousekii[i]) * Math.sin(koubai) * Math.sin(houi) * // + Math.cos(taiyousekii[i]) * Math.sin(koubai) * Math.sin(houi) *
// Math.sin(jikakudo[i][j]))); // Math.sin(jikakudo[i][j])));
// System.err.println( " " ); // System.err.println( " " );
//houi 절대값으로 변경
cosTheta[m][j] = cosTheta[m][j] =
Math.max( Math.max(
0, 0,
(Math.sin(latlng[i][0]) * Math.cos(koubai) (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.sin(taiyousekii[i])
+ (Math.cos(latlng[i][0]) * Math.cos(koubai) + (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(taiyousekii[i])
* Math.cos(jikakudo[i][j]) * Math.cos(jikakudo[i][j])
+ Math.cos(taiyousekii[i]) + Math.cos(taiyousekii[i])
* Math.sin(koubai) * Math.sin(koubai)
* Math.sin(houi) * Math.sin(Math.abs(houi))
* Math.sin(jikakudo[i][j])); * Math.sin(jikakudo[i][j]));
rb[m][j] = (cosThetaZ[i][j] == 0) ? 0 : cosTheta[m][j] / cosThetaZ[i][j]; rb[m][j] = (cosThetaZ[i][j] == 0) ? 0 : cosTheta[m][j] / cosThetaZ[i][j];