260323_01_ENH: 분석 도중 비효율적인 코드 수정 및 추출 조정 수정
This commit is contained in:
@@ -42,13 +42,13 @@ namespace Keps.WinForms.Services
|
||||
List<string> candidateRatioKeys = (result.CandidateRatioKeys ?? new List<string>()).ToList();
|
||||
NormalizeCandidateLists(candidateNames, candidateVoteKeys, candidateRatioKeys);
|
||||
|
||||
WriteExtractedSheet(package.Workbook.Worksheets.Add(areaName + "-추출결과"), electionName, areaName, candidateNames, candidateVoteKeys, result.ExtractedRows ?? new List<ExtractionRow>(), result.PopulationRows ?? new List<ExtractionRow>(), result);
|
||||
WriteExtractedSheet(package.Workbook.Worksheets.Add(areaName + "-추출결과"), electionName, candidateNames, candidateVoteKeys, result.ExtractedRows ?? new List<ExtractionRow>(), result.PopulationRows ?? new List<ExtractionRow>(), result);
|
||||
WriteVerificationSummarySheet(package.Workbook.Worksheets.Add(areaName + "-자가 검증-요약분석"), electionName, areaName, candidateNames, result.VerificationRows ?? new List<VerificationSummaryRow>(), result.ClusterMax);
|
||||
WriteVerificationDetailSheet(package.Workbook.Worksheets.Add(areaName + "-자가 검증-세부분석"), electionName, areaName, candidateNames, candidateVoteKeys, result.ExtractedRows ?? new List<ExtractionRow>(), result.VerificationRows ?? new List<VerificationSummaryRow>(), result.ClusterMax);
|
||||
WriteFinalStatusSheet(package.Workbook.Worksheets.Add(areaName + "-최종 투표소 추출현황"), electionName, areaName, candidateNames, candidateVoteKeys, result.PopulationRows ?? new List<ExtractionRow>(), result.ClusterMax, adjustList);
|
||||
WriteClusterListSheet(package.Workbook.Worksheets.Add(areaName + "-층별 시군구 리스트"), electionName, areaName, result.PopulationRows ?? new List<ExtractionRow>());
|
||||
WriteModeSheet(package.Workbook.Worksheets.Add(areaName + "-기준설정 Mode"), electionName, clusterRows ?? new List<ClusterSummaryRow>(), result.PopulationRows ?? new List<ExtractionRow>());
|
||||
WriteModeTargetSheet(package.Workbook.Worksheets.Add(areaName + "-기준설정 Mode Target"), clusterRows ?? new List<ClusterSummaryRow>(), result.PopulationRows ?? new List<ExtractionRow>());
|
||||
WriteModeTargetSheet(package.Workbook.Worksheets.Add(areaName + "-기준설정 Mode Target"), clusterRows ?? new List<ClusterSummaryRow>(), result.PopulationRows ?? new List<ExtractionRow>(), adjustList);
|
||||
|
||||
package.SaveAs(new FileInfo(filePath));
|
||||
}
|
||||
@@ -59,13 +59,12 @@ namespace Keps.WinForms.Services
|
||||
/// </summary>
|
||||
/// <param name="ws">대상 워크시트.</param>
|
||||
/// <param name="electionName">선거명 또는 연월.</param>
|
||||
/// <param name="areaName">시도명.</param>
|
||||
/// <param name="candidateNames">후보자 표시명 목록(최소 3개로 보정됨).</param>
|
||||
/// <param name="candidateVoteKeys">후보자 득표 키 목록(최소 3개로 보정됨).</param>
|
||||
/// <param name="rows">추출 표본 행 목록.</param>
|
||||
/// <param name="populationRows">모집단 행 목록.</param>
|
||||
/// <param name="result">추출 실행 메타(정렬/오프셋 등).</param>
|
||||
private static void WriteExtractedSheet(ExcelWorksheet ws, string electionName, string areaName, List<string> candidateNames, List<string> candidateVoteKeys, List<ExtractionRow> rows, List<ExtractionRow> populationRows, RealExtractionResult result)
|
||||
private static void WriteExtractedSheet(ExcelWorksheet ws, string electionName, List<string> candidateNames, List<string> candidateVoteKeys, List<ExtractionRow> rows, List<ExtractionRow> populationRows, RealExtractionResult result)
|
||||
{
|
||||
int rowIndex = 1;
|
||||
foreach (IGrouping<int, ExtractionRow> clusterGroup in rows.GroupBy(x => x.ClusterNo).OrderBy(x => x.Key))
|
||||
@@ -432,11 +431,12 @@ namespace Keps.WinForms.Services
|
||||
|
||||
foreach (ExtractionRow row in group.OrderBy(x => x.OriginalOrder))
|
||||
{
|
||||
bool isAdjust = adjustList.Any(a => a.ClusterNo == row.ClusterNo && a.AdjustId == row.OriginalOrder);
|
||||
bool isAdjusted = adjustList.Any(a => a.ClusterNo == row.ClusterNo && a.ExtractId == row.OriginalOrder && a.AdjustId != null);
|
||||
row.IsAdjustedSelected = adjustList.Any(a => a.ClusterNo == row.ClusterNo && a.AdjustId == row.OriginalOrder);
|
||||
|
||||
string autoSelected = (row.IsAutoSelected || row.IsAdjustedSelected) ? "★" : null;
|
||||
string adjustedSelected = isAdjust ? "★" : autoSelected;
|
||||
string autoSelected = row.IsAutoSelected ? "★" : null;
|
||||
string adjustedSelected = row.IsAdjustedSelected ? "★" : autoSelected;
|
||||
|
||||
bool isAdjusted = adjustList.Any(a => a.ClusterNo == row.ClusterNo && a.ExtractId == row.OriginalOrder && a.AdjustId != null);
|
||||
if (isAdjusted)
|
||||
{
|
||||
adjustedSelected = null;
|
||||
@@ -549,7 +549,7 @@ namespace Keps.WinForms.Services
|
||||
/// <param name="ws">대상 워크시트.</param>
|
||||
/// <param name="clusterRows">군집 요약 행 목록.</param>
|
||||
/// <param name="rows">모집단 행 목록.</param>
|
||||
private static void WriteModeTargetSheet(ExcelWorksheet ws, List<ClusterSummaryRow> clusterRows, List<ExtractionRow> rows)
|
||||
private static void WriteModeTargetSheet(ExcelWorksheet ws, List<ClusterSummaryRow> clusterRows, List<ExtractionRow> rows, List<AdjustmentRow> adjustList)
|
||||
{
|
||||
MergeAndSet(ws, 1, 1, 1, 6, "Target 층별 현황");
|
||||
ws.Cells[2, 1].Value = "층";
|
||||
@@ -563,8 +563,19 @@ namespace Keps.WinForms.Services
|
||||
int rowIndex = 3;
|
||||
foreach (ClusterSummaryRow row in clusterRows.OrderBy(x => x.ClusterNo))
|
||||
{
|
||||
List<int> finalAdjustList = adjustList
|
||||
.Where(x => x.ClusterNo == row.ClusterNo)
|
||||
.Select(x => x.AdjustId ?? x.ExtractId)
|
||||
.ToList();
|
||||
|
||||
List<ExtractionRow> clusterPopulation = rows.Where(x => x.ClusterNo == row.ClusterNo).OrderBy(x => x.OriginalOrder).ToList();
|
||||
string areas = string.Join(string.Empty, clusterPopulation.Where(x => x.IsAutoSelected || x.IsAdjustedSelected).Select(x => x.EupMyeonDong + "-" + x.PollingPlaceNo + "투, "));
|
||||
//adjustList.
|
||||
string areas = string.Join(string.Empty,
|
||||
clusterPopulation
|
||||
.Where(x => finalAdjustList.Contains(x.ClusterOrder))
|
||||
.Select(x => x.EupMyeonDong + "-" + x.PollingPlaceNo + "투, ")
|
||||
);
|
||||
|
||||
ws.Cells[rowIndex, 1].Value = row.ClusterNo + " 층";
|
||||
ws.Cells[rowIndex, 2].Value = row.PollingPlaceCount;
|
||||
ws.Cells[rowIndex, 3].Value = null;
|
||||
|
||||
Reference in New Issue
Block a user