260416_05_ENH: 1차 튜닝

This commit is contained in:
2026-04-16 16:14:27 +09:00
parent c549ad6344
commit ac8401061f
6 changed files with 223 additions and 229 deletions

View File

@@ -28,15 +28,12 @@ public class ABPairExcelDto {
@ExcelColumn(header = "공유 파견 권역", order = 5, width = 15)
private String sharedDispatchRegion;
@ExcelColumn(header = "공유 인접지역 분류", order = 6, width = 18)
private String sharedAdjacentRegionClassification;
@ExcelColumn(header = "A 배정일", order = 7, width = 25)
@ExcelColumn(header = "A 배정일", order = 6, width = 25)
private String aAssignmentDates;
@ExcelColumn(header = "B 배정일", order = 8, width = 25)
@ExcelColumn(header = "B 배정일", order = 7, width = 25)
private String bAssignmentDates;
@ExcelColumn(header = "날짜 겹침 여부", order = 9, width = 15)
@ExcelColumn(header = "날짜 겹침 여부", order = 8, width = 15)
private String dateOverlapped;
}

View File

@@ -52,10 +52,10 @@ public class PairingCandidateService {
private List<PairCandidate> createPairCandidates(List<Member> members) {
List<Member> fieldMembers = members.stream()
.filter((member) -> member.getRole() == MemberRole.FIELD).toList();
.filter(member -> member.getRole() == MemberRole.FIELD).toList();
List<Member> externalMembers = members.stream()
.filter((member) -> member.getRole() == MemberRole.EXTERNAL).toList();
List<PairCandidate> candidates = new ArrayList();
.filter(member -> member.getRole() == MemberRole.EXTERNAL).toList();
List<PairCandidate> candidates = new ArrayList<>();
for (Member fieldMember : fieldMembers) {
for (Member externalMember : externalMembers) {
@@ -75,27 +75,28 @@ public class PairingCandidateService {
private List<DispatchRegionCandidate> createDispatchRegionCandidates(PairingData data,
List<PairCandidate> pairCandidates) {
Map<String, Member> memberMap = toMemberMap(data.getMembers());
Set<String> dispatchRegions = (Set) data.getCenterAdjacentRegions().stream()
Set<String> dispatchRegions = data.getCenterAdjacentRegions().stream()
.map(CenterAdjacentRegion::getDispatchRegion).collect(Collectors.toSet());
List<DispatchRegionCandidate> candidates = new ArrayList();
List<DispatchRegionCandidate> candidates = new ArrayList<>();
for (PairCandidate pairCandidate : pairCandidates) {
Member fieldMember = (Member) memberMap.get(pairCandidate.getFieldMemberId());
Member externalMember = (Member) memberMap.get(pairCandidate.getExternalMemberId());
Member fieldMember = memberMap.get(pairCandidate.getFieldMemberId());
Member externalMember = memberMap.get(pairCandidate.getExternalMemberId());
for (String dispatchRegion : dispatchRegions) {
if (!isConflictRegion(fieldMember, externalMember, dispatchRegion)) {
int fieldRank = findPreferenceRank(fieldMember, dispatchRegion);
int externalRank = findPreferenceRank(externalMember, dispatchRegion);
Optional<PreferenceMatchRule> matchRule = findPreferenceMatchRule(
data.getPreferenceMatchRules(), fieldRank, externalRank);
if (!matchRule.isEmpty()) {
candidates.add(DispatchRegionCandidate.builder().fieldMemberId(fieldMember.getId())
.externalMemberId(externalMember.getId()).dispatchRegion(dispatchRegion)
.preferencePriority(((PreferenceMatchRule) matchRule.get()).getPriority())
.fieldMemberPreferenceRank(fieldRank).externalMemberPreferenceRank(externalRank)
.build());
}
matchRule.ifPresent(preferenceMatchRule -> candidates.add(
DispatchRegionCandidate.builder().fieldMemberId(fieldMember.getId())
.externalMemberId(externalMember.getId()).dispatchRegion(dispatchRegion)
.preferencePriority(preferenceMatchRule.getPriority())
.fieldMemberPreferenceRank(fieldRank).externalMemberPreferenceRank(externalRank)
.build()));
}
}
}
@@ -103,40 +104,44 @@ public class PairingCandidateService {
return candidates;
}
private List<AssignmentCandidate> createAssignmentCandidates(PairingData data,
List<PairCandidate> pairCandidates, List<DispatchRegionCandidate> dispatchRegionCandidates,
Map<String, Set<String>> unassignedCenterReasons) {
private List<AssignmentCandidate> createAssignmentCandidates(
PairingData data,
List<PairCandidate> pairCandidates,
List<DispatchRegionCandidate> dispatchRegionCandidates,
Map<String, Set<String>> unassignedCenterReasons
) {
Map<String, Member> memberMap = toMemberMap(data.getMembers());
Map<String, Municipality> municipalityMap = (Map) data.getMunicipalities().stream()
Map<String, Municipality> municipalityMap = data.getMunicipalities().stream()
.collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left));
Map<String, PairCandidate> pairMap = (Map) pairCandidates.stream()
Map<String, PairCandidate> pairMap = pairCandidates.stream()
.collect(Collectors.toMap(this::pairKey, Function.identity(), (left, right) -> left));
Map<String, Set<String>> adjacentClassificationsByDispatchRegion = (Map) data.getCenterAdjacentRegions()
Map<String, Set<String>> adjacentClassificationsByDispatchRegion = data.getCenterAdjacentRegions()
.stream().collect(Collectors.groupingBy(CenterAdjacentRegion::getDispatchRegion,
Collectors.mapping(CenterAdjacentRegion::getAdjacentRegionClassification,
Collectors.toSet())));
List<AssignmentCandidate> candidates = new ArrayList();
List<AssignmentCandidate> candidates = new ArrayList<>();
for (DispatchRegionCandidate dispatchCandidate : dispatchRegionCandidates) {
Member fieldMember = (Member) memberMap.get(dispatchCandidate.getFieldMemberId());
Member externalMember = (Member) memberMap.get(dispatchCandidate.getExternalMemberId());
PairCandidate pairCandidate = (PairCandidate) pairMap.get(
Member fieldMember = memberMap.get(dispatchCandidate.getFieldMemberId());
Member externalMember = memberMap.get(dispatchCandidate.getExternalMemberId());
PairCandidate pairCandidate = pairMap.get(
pairKey(dispatchCandidate.getFieldMemberId(),
dispatchCandidate.getExternalMemberId()));
Set<String> adjacentClassifications = (Set) adjacentClassificationsByDispatchRegion.getOrDefault(
dispatchCandidate.getDispatchRegion(), Set.of());
Set<String> adjacentClassifications = adjacentClassificationsByDispatchRegion
.getOrDefault(dispatchCandidate.getDispatchRegion(), Set.of());
for (Center center : data.getCenters()) {
if (!adjacentClassifications.contains(center.getAdjacentRegionClassification())) {
addReason(unassignedCenterReasons, center.getId(), "파견 권역과 센터 인접지역 분류 불일치");
} else {
Municipality municipality = (Municipality) municipalityMap.get(
Municipality municipality = municipalityMap.get(
center.getMunicipalityId());
List<String> centerReasons = findCenterHardRuleReasons(fieldMember, externalMember,
center);
if (!centerReasons.isEmpty()) {
centerReasons.forEach(
(reason) -> addReason(unassignedCenterReasons, center.getId(), reason));
reason -> addReason(unassignedCenterReasons, center.getId(), reason));
} else {
LocalDate firstAssignableDate = findFirstAssignableDate(fieldMember,
externalMember, municipality, center, commonUnavailableDates(data));
@@ -211,8 +216,8 @@ public class PairingCandidateService {
return candidates;
}
Map<String, Integer> memberUsage = new HashMap();
List<AssignmentCandidate> selected = new ArrayList();
Map<String, Integer> memberUsage = new HashMap<>();
List<AssignmentCandidate> selected = new ArrayList<>();
for (AssignmentCandidate candidate : candidates.stream()
.sorted(assignmentCandidateComparator())
@@ -282,7 +287,7 @@ public class PairingCandidateService {
List<String> preferences = member.getPreferenceRegions();
for (int i = 0; i < preferences.size(); ++i) {
String preference = (String) preferences.get(i);
String preference = preferences.get(i);
if (dispatchRegion.equals(preference)) {
return i + 1;
}
@@ -297,12 +302,13 @@ public class PairingCandidateService {
private Optional<PreferenceMatchRule> findPreferenceMatchRule(List<PreferenceMatchRule> rules,
int fieldRank, int externalRank) {
return fieldRank >= 0 && externalRank >= 0 ? rules.stream().filter(
(rule) -> matchesPreferenceRank(rule.getFieldMemberPreferenceRank(), fieldRank))
.filter((rule) -> matchesPreferenceRank(
rule.getExternalMemberPreferenceRank(),
externalRank)).min(
Comparator.comparingInt(PreferenceMatchRule::getPriority)) : Optional.empty();
return fieldRank >= 0 && externalRank >= 0 ?
rules.stream().filter(
rule -> matchesPreferenceRank(rule.getFieldMemberPreferenceRank(), fieldRank)
)
.filter(rule -> matchesPreferenceRank(rule.getExternalMemberPreferenceRank(),externalRank))
.min(Comparator.comparingInt(PreferenceMatchRule::getPriority))
: Optional.empty();
}
private boolean matchesPreferenceRank(int ruleRank, int memberRank) {
@@ -311,7 +317,7 @@ public class PairingCandidateService {
private List<String> findCenterHardRuleReasons(Member fieldMember, Member externalMember,
Center center) {
List<String> reasons = new ArrayList();
List<String> reasons = new ArrayList<>();
if (center.isWomenOnly() && (fieldMember.getGender() != Gender.FEMALE
|| externalMember.getGender() != Gender.FEMALE)) {
reasons.add("여성 전용 센터 조건 불충족");
@@ -333,18 +339,16 @@ public class PairingCandidateService {
LocalDate end = min(
min(fieldMember.getAvailableEndDate(), externalMember.getAvailableEndDate()),
min(municipality.getAvailableEndDate(), center.getAvailableEndDate()));
if (start.isAfter(end)) {
return null;
} else {
if (!start.isAfter(end)) {
for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1L)) {
if (isAvailableOn(date, fieldMember, externalMember, municipality, center,
commonUnavailableDates)) {
return date;
}
}
return null;
}
return null;
}
private boolean isAvailableOn(LocalDate date, Member fieldMember, Member externalMember,
@@ -356,13 +360,13 @@ public class PairingCandidateService {
}
private Map<String, Set<String>> createInitialCenterReasonMap(PairingData data) {
Map<String, Set<String>> reasons = new HashMap();
data.getCenters().forEach((center) -> reasons.put(center.getId(), new LinkedHashSet()));
Map<String, Set<String>> reasons = new HashMap<>();
data.getCenters().forEach(center -> reasons.put(center.getId(), new LinkedHashSet<>()));
return reasons;
}
private void addReason(Map<String, Set<String>> reasons, String centerId, String reason) {
((Set) reasons.computeIfAbsent(centerId, (key) -> new LinkedHashSet())).add(reason);
reasons.computeIfAbsent(centerId, key -> new LinkedHashSet<>()).add(reason);
}
private Set<LocalDate> commonUnavailableDates(PairingData data) {
@@ -370,7 +374,7 @@ public class PairingCandidateService {
}
private Map<String, Member> toMemberMap(List<Member> members) {
return (Map) members.stream()
return members.stream()
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
}
@@ -448,7 +452,7 @@ public class PairingCandidateService {
private int preferenceScore(int priority) {
return (int) Math.max(0L, pairingProperties.getObjective().getPreferenceBaseWeight()
- (long) priority * pairingProperties.getObjective().getPreferenceRankPenalty());
- priority * pairingProperties.getObjective().getPreferenceRankPenalty());
}
private int preferenceRankBonus(int rank) {

View File

@@ -31,13 +31,13 @@ public class PairingHolidayService {
}
private Set<String> collectYears(PairingData data) {
Set<String> years = new HashSet();
data.getMembers().forEach((member) -> addYears(years, member.getAvailableStartDate(),
Set<String> years = new HashSet<>();
data.getMembers().forEach(member -> addYears(years, member.getAvailableStartDate(),
member.getAvailableEndDate()));
data.getMunicipalities().forEach(
(municipality) -> addYears(years, municipality.getAvailableStartDate(),
municipality -> addYears(years, municipality.getAvailableStartDate(),
municipality.getAvailableEndDate()));
data.getCenters().forEach((center) -> addYears(years, center.getAvailableStartDate(),
data.getCenters().forEach(center -> addYears(years, center.getAvailableStartDate(),
center.getAvailableEndDate()));
return years;
}

View File

@@ -110,7 +110,7 @@ public class PairingNormalizeService {
}
private List<String> normalizePreferenceRegions(MemberExcelDto row) {
List<String> preferences = new ArrayList(Arrays.asList(
List<String> preferences = new ArrayList<>(Arrays.asList(
normalizeCode(row.getPreferenceRegion1(), regionCodeLength(), "선호 지역1"),
normalizeCode(row.getPreferenceRegion2(), regionCodeLength(), "선호 지역2"),
normalizeCode(row.getPreferenceRegion3(), regionCodeLength(), "선호 지역3"),
@@ -189,9 +189,9 @@ public class PairingNormalizeService {
return new LinkedHashSet<>();
}
return (Set) parseCsv(value).stream()
return parseCsv(value).stream()
.filter(date -> !isFormulaText(date))
.map((date) -> parseDate(date, fieldName))
.map(date -> parseDate(date, fieldName))
.collect(Collectors.toCollection(LinkedHashSet::new));
}
@@ -202,9 +202,9 @@ public class PairingNormalizeService {
private Set<String> parseCsv(String value) {
String cleaned = clean(value);
return (Set<String>) (cleaned.isBlank() ? new LinkedHashSet()
: (Set) Arrays.stream(cleaned.split(",")).map(String::trim)
.filter((token) -> !token.isBlank())
return (cleaned.isBlank() ? new LinkedHashSet<>()
: Arrays.stream(cleaned.split(",")).map(String::trim)
.filter(token -> !token.isBlank())
.collect(Collectors.toCollection(LinkedHashSet::new)));
}

View File

@@ -7,7 +7,6 @@ import com.google.ortools.sat.CpSolver;
import com.google.ortools.sat.CpSolverStatus;
import com.google.ortools.sat.LinearArgument;
import com.google.ortools.sat.LinearExpr;
import com.google.ortools.sat.Literal;
import com.kri.p6.ncrc.pairing.common.enums.ExperienceType;
import com.kri.p6.ncrc.pairing.common.enums.Gender;
import com.kri.p6.ncrc.pairing.config.PairingProperties;
@@ -88,7 +87,7 @@ public class PairingSolverService {
BoolVar[] vars = new BoolVar[candidates.size()];
for (int i = 0; i < candidates.size(); ++i) {
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
AssignmentCandidate candidate = candidates.get(i);
vars[i] = model.newBoolVar("assign_" + i + "_" + candidate.getCenterId());
}
@@ -97,34 +96,31 @@ public class PairingSolverService {
private Map<String, BoolVar> createPairUsedVars(CpModel model,
List<AssignmentCandidate> candidates) {
return (Map) candidates.stream().map(this::pairKey).distinct().collect(
Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_used_" + key)));
return candidates.stream().map(this::pairKey).distinct().collect(
Collectors.toMap(Function.identity(), key -> model.newBoolVar("pair_used_" + key)));
}
private Map<String, BoolVar> createPairDayVars(CpModel model,
List<AssignmentCandidate> candidates) {
return (Map) candidates.stream().map(this::pairDayKey).distinct().collect(
Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_day_" + key)));
return candidates.stream().map(this::pairDayKey).distinct().collect(
Collectors.toMap(Function.identity(), key -> model.newBoolVar("pair_day_" + key)));
}
private Map<String, BoolVar> createPairDayAdjacentVars(CpModel model,
List<AssignmentCandidate> candidates) {
return (Map) candidates.stream().map(this::pairDayAdjacentKey).distinct().collect(
return candidates.stream().map(this::pairDayAdjacentKey).distinct().collect(
Collectors.toMap(Function.identity(),
(key) -> model.newBoolVar("pair_day_adjacent_" + key)));
key -> model.newBoolVar("pair_day_adjacent_" + key)));
}
private void linkHelperVars(CpModel model, List<AssignmentCandidate> candidates,
BoolVar[] assignmentVars, Map<String, BoolVar> pairUsedVars, Map<String, BoolVar> pairDayVars,
Map<String, BoolVar> pairDayAdjacentVars) {
for (int i = 0; i < candidates.size(); ++i) {
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
model.addLessOrEqual(assignmentVars[i],
(LinearArgument) pairUsedVars.get(pairKey(candidate)));
model.addLessOrEqual(assignmentVars[i],
(LinearArgument) pairDayVars.get(pairDayKey(candidate)));
model.addLessOrEqual(assignmentVars[i],
(LinearArgument) pairDayAdjacentVars.get(pairDayAdjacentKey(candidate)));
AssignmentCandidate candidate = candidates.get(i);
model.addLessOrEqual(assignmentVars[i], pairUsedVars.get(pairKey(candidate)));
model.addLessOrEqual(assignmentVars[i], pairDayVars.get(pairDayKey(candidate)));
model.addLessOrEqual(assignmentVars[i], pairDayAdjacentVars.get(pairDayAdjacentKey(candidate)));
}
}
@@ -134,58 +130,58 @@ public class PairingSolverService {
Map<String, List<Integer>> indexesByCenter = groupIndexes(candidates,
AssignmentCandidate::getCenterId);
indexesByCenter.values()
.forEach((indexes) -> model.addAtMostOne(toLiteralArray(indexes, assignmentVars)));
.forEach(indexes -> model.addAtMostOne(toLiteralArray(indexes, assignmentVars)));
}
private void addPairDailyCapacity(CpModel model, List<AssignmentCandidate> candidates,
BoolVar[] assignmentVars) {
Map<String, List<Integer>> indexesByPairDay = groupIndexes(candidates, this::pairDayKey);
indexesByPairDay.values().forEach((indexes) -> model.addLessOrEqual(
indexesByPairDay.values().forEach(indexes -> model.addLessOrEqual(
LinearExpr.sum(toLinearArgumentArray(indexes, assignmentVars)),
(long) pairingProperties.getRule().getMaxCentersPerPairPerDay()));
pairingProperties.getRule().getMaxCentersPerPairPerDay()));
}
private void addMemberDailyOnePair(CpModel model, List<AssignmentCandidate> candidates,
Map<String, BoolVar> pairDayVars) {
Map<String, Set<String>> pairDayKeysByMemberDay = (Map) candidates.stream()
.collect(Collectors.groupingBy((candidate) -> {
Map<String, Set<String>> pairDayKeysByMemberDay = candidates.stream()
.collect(Collectors.groupingBy(candidate -> {
String var10000 = candidate.getFieldMemberId();
return var10000 + "|" + String.valueOf(candidate.getDate());
return var10000 + "|" + candidate.getDate();
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
Map<String, Set<String>> externalPairDayKeysByMemberDay = candidates.stream()
.collect(Collectors.groupingBy((candidate) -> {
.collect(Collectors.groupingBy(candidate -> {
String var10000 = candidate.getExternalMemberId();
return var10000 + "|" + String.valueOf(candidate.getDate());
return var10000 + "|" + candidate.getDate();
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
externalPairDayKeysByMemberDay.forEach(
(key, value) -> pairDayKeysByMemberDay.merge(key, value, (left, right) -> {
left.addAll(right);
return left;
}));
pairDayKeysByMemberDay.values().forEach((pairDayKeys) -> {
Stream var10001 = pairDayKeys.stream();
pairDayKeysByMemberDay.values().forEach(pairDayKeys -> {
Stream<String> var10001 = pairDayKeys.stream();
Objects.requireNonNull(pairDayVars);
model.addAtMostOne(
(Literal[]) var10001.map(pairDayVars::get).toArray((x$0) -> new BoolVar[x$0]));
model.addAtMostOne(var10001.map(pairDayVars::get).toArray(BoolVar[]::new));
});
}
private void addPairDailyOneAdjacentClassification(CpModel model,
List<AssignmentCandidate> candidates, Map<String, BoolVar> pairDayAdjacentVars) {
Map<String, Set<String>> adjacentKeysByPairDay = (Map) candidates.stream().collect(
Map<String, Set<String>> adjacentKeysByPairDay = candidates.stream().collect(
Collectors.groupingBy(this::pairDayKey,
Collectors.mapping(this::pairDayAdjacentKey, Collectors.toSet())));
adjacentKeysByPairDay.values().forEach((adjacentKeys) -> {
Stream var10001 = adjacentKeys.stream();
adjacentKeysByPairDay.values().forEach(adjacentKeys -> {
Stream<String> var10001 = adjacentKeys.stream();
Objects.requireNonNull(pairDayAdjacentVars);
model.addAtMostOne(
(Literal[]) var10001.map(pairDayAdjacentVars::get).toArray((x$0) -> new BoolVar[x$0]));
model.addAtMostOne(var10001.map(pairDayAdjacentVars::get).toArray(BoolVar[]::new));
});
}
private void addBuddyLimit(CpModel model, List<AssignmentCandidate> candidates,
Map<String, BoolVar> pairUsedVars) {
Map<String, Set<String>> pairKeysByMember = (Map) candidates.stream().collect(
Map<String, Set<String>> pairKeysByMember = candidates.stream().collect(
Collectors.groupingBy(AssignmentCandidate::getFieldMemberId,
Collectors.mapping(this::pairKey, Collectors.toSet())));
Map<String, Set<String>> externalPairKeysByMember = candidates.stream().collect(
@@ -196,12 +192,12 @@ public class PairingSolverService {
left.addAll(right);
return left;
}));
pairKeysByMember.values().forEach((pairKeys) -> {
Stream var10001 = pairKeys.stream();
pairKeysByMember.values().forEach(pairKeys -> {
Stream<String> var10001 = pairKeys.stream();
Objects.requireNonNull(pairUsedVars);
model.addLessOrEqual(LinearExpr.sum((LinearArgument[]) var10001.map(pairUsedVars::get)
.toArray((x$0) -> new LinearArgument[x$0])),
(long) pairingProperties.getRule().getMaxCounterpartsPerMember());
.toArray(LinearArgument[]::new)),
pairingProperties.getRule().getMaxCounterpartsPerMember());
});
}
@@ -211,13 +207,13 @@ public class PairingSolverService {
long[] weights = new long[assignmentVars.length];
for (int i = 0; i < assignmentVars.length; ++i) {
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
AssignmentCandidate candidate = candidates.get(i);
vars[i] = assignmentVars[i];
weights[i] = pairingProperties.getObjective().getAssignmentWeight() + Math.max(0L,
pairingProperties.getObjective().getPreferenceBaseWeight()
- (long) candidate.getPreferencePriority() * pairingProperties.getObjective()
- candidate.getPreferencePriority() * pairingProperties.getObjective()
.getPreferenceRankPenalty())
+ (long) candidate.getResidenceMatchScore() * pairingProperties.getObjective()
+ candidate.getResidenceMatchScore() * pairingProperties.getObjective()
.getResidenceMatchWeight();
}
@@ -226,11 +222,11 @@ public class PairingSolverService {
private List<AssignmentCandidate> collectSelectedAssignments(List<AssignmentCandidate> candidates,
BoolVar[] assignmentVars, CpSolver solver) {
List<AssignmentCandidate> selected = new ArrayList();
List<AssignmentCandidate> selected = new ArrayList<>();
for (int i = 0; i < candidates.size(); ++i) {
if (Boolean.TRUE.equals(solver.booleanValue(assignmentVars[i]))) {
selected.add((AssignmentCandidate) candidates.get(i));
selected.add(candidates.get(i));
}
}
@@ -242,27 +238,26 @@ public class PairingSolverService {
private PairingResult toResult(PairingData data, PairingCandidates candidates,
List<AssignmentCandidate> selectedAssignments, CpSolverStatus status) {
Set<String> assignedCenterIds = (Set) selectedAssignments.stream()
.map(AssignmentCandidate::getCenterId).collect(Collectors.toSet());
Set<String> usedMemberIds = (Set) selectedAssignments.stream().flatMap(
(candidate) -> List.of(candidate.getFieldMemberId(), candidate.getExternalMemberId())
.stream()).collect(Collectors.toSet());
Map<String, Member> memberMap = (Map) data.getMembers().stream()
Set<String> assignedCenterIds = selectedAssignments.stream().map(AssignmentCandidate::getCenterId).collect(Collectors.toSet());
Set<String> usedMemberIds = selectedAssignments.stream().flatMap(
candidate -> Stream.of(candidate.getFieldMemberId(), candidate.getExternalMemberId())).collect(Collectors.toSet()
);
Map<String, Member> memberMap = data.getMembers().stream()
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
Map<String, Center> centerMap = (Map) data.getCenters().stream()
Map<String, Center> centerMap = data.getCenters().stream()
.collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
ABPairBuildResult abPairBuildResult = createABPairMatches(selectedAssignments);
Map<String, ABPairMatch> abPairMatches = abPairBuildResult.matches();
List<AssignmentResultExcelDto> assignments = selectedAssignments.stream()
.map((candidate) -> toAssignmentResult(candidate, memberMap, centerMap, abPairMatches))
.map(candidate -> toAssignmentResult(candidate, memberMap, centerMap, abPairMatches))
.toList();
List<UnassignedCenterExcelDto> unassignedCenters = data.getCenters().stream()
.filter((center) -> !assignedCenterIds.contains(center.getId()))
.map((center) -> toUnassignedCenter(center, candidates.getUnassignedCenterReasons()))
.filter(center -> !assignedCenterIds.contains(center.getId()))
.map(center -> toUnassignedCenter(center, candidates.getUnassignedCenterReasons()))
.toList();
List<UnusedMemberExcelDto> unusedMembers = data.getMembers().stream()
.filter((member) -> !usedMemberIds.contains(member.getId())).map(
(member) -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(),
.filter(member -> !usedMemberIds.contains(member.getId())).map(
member -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(),
"선택된 최적해에 포함되지 않았습니다. 후보 부족 또는 제약 충돌 가능")).toList();
return PairingResult.builder().assignments(assignments).unassignedCenters(unassignedCenters)
.unusedMembers(unusedMembers).summaries(
@@ -278,9 +273,9 @@ public class PairingSolverService {
private PairingResult emptyResult(PairingData data, PairingCandidates candidates, String reason) {
return PairingResult.builder().assignments(List.of()).unassignedCenters(
data.getCenters().stream().map(
(center) -> new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(),
center -> new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(),
reason)).toList()).unusedMembers(data.getMembers().stream()
.map((member) -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(), reason))
.map(member -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(), reason))
.toList()).summaries(createSummaries(data, candidates, 0, data.getCenters().size(),
data.getMembers().size(), 0, reason)).abPairs(List.of()).candidateSummaries(
createCandidateSummaries(data, candidates, 0, data.getCenters().size(),
@@ -292,10 +287,10 @@ public class PairingSolverService {
private AssignmentResultExcelDto toAssignmentResult(AssignmentCandidate candidate,
Map<String, Member> memberMap, Map<String, Center> centerMap,
Map<String, ABPairMatch> abPairMatches) {
Member fieldMember = (Member) memberMap.get(candidate.getFieldMemberId());
Member externalMember = (Member) memberMap.get(candidate.getExternalMemberId());
Center center = (Center) centerMap.get(candidate.getCenterId());
ABPairMatch abPairMatch = (ABPairMatch) abPairMatches.get(pairKey(candidate));
Member fieldMember = memberMap.get(candidate.getFieldMemberId());
Member externalMember = memberMap.get(candidate.getExternalMemberId());
Center center = centerMap.get(candidate.getCenterId());
ABPairMatch abPairMatch = abPairMatches.get(pairKey(candidate));
return new AssignmentResultExcelDto(candidate.getDate().toString(),
candidate.getFieldMemberId(), formatGender(fieldMember.getGender()),
formatExperience(fieldMember.getExperienceType()), fieldMember.getResidenceCode(),
@@ -361,18 +356,18 @@ public class PairingSolverService {
Map<String, List<AssignmentCandidate>> assignmentsByPair = selectedAssignments.stream()
.collect(Collectors.groupingBy(this::pairKey));
List<UsedPair> usedPairs = assignmentsByPair.entrySet().stream()
.map((entry) -> PairingSolverService.UsedPair.of(entry.getKey(), entry.getValue()))
.map(entry -> PairingSolverService.UsedPair.of(entry.getKey(), entry.getValue()))
.sorted(Comparator.comparing(UsedPair::pairKey)).toList();
Map<String, ABPairMatch> matches = new HashMap();
List<ABPairExcelDto> rows = new ArrayList();
Set<String> alreadyMatched = new HashSet();
Map<String, ABPairMatch> matches = new HashMap<>();
List<ABPairExcelDto> rows = new ArrayList<>();
Set<String> alreadyMatched = new HashSet<>();
int groupSequence = 1;
for (UsedPair pair : usedPairs) {
if (!alreadyMatched.contains(pair.pairKey())) {
UsedPair counterpart = usedPairs.stream()
.filter((candidate) -> !alreadyMatched.contains(candidate.pairKey()))
.filter((candidate) -> !candidate.pairKey().equals(pair.pairKey()))
.filter(candidate -> !alreadyMatched.contains(candidate.pairKey()))
.filter(candidate -> !candidate.pairKey().equals(pair.pairKey()))
.filter(pair::canBeABWith)
.findFirst()
.orElse(null);
@@ -403,34 +398,37 @@ public class PairingSolverService {
}
private ABPairExcelDto toABPairRow(String groupId, UsedPair pair, UsedPair counterpart) {
Stream var10000 = pair.dispatchAdjacentKeys().stream();
Set var10001 = counterpart.dispatchAdjacentKeys();
Objects.requireNonNull(var10001);
String sharedKey = (String) var10000.filter(var10001::contains).sorted().findFirst()
.orElse("|");
String[] parts = sharedKey.split("\\|", -1);
var10000 = pair.dates().stream();
var10001 = counterpart.dates();
Objects.requireNonNull(var10001);
boolean dateOverlapped = var10000.anyMatch(var10001::contains);
return new ABPairExcelDto(groupId, pair.fieldMemberId(), pair.externalMemberId(),
counterpart.fieldMemberId(), counterpart.externalMemberId(),
parts.length > 0 ? parts[0] : "", parts.length > 1 ? parts[1] : "",
formatDates(pair.dates()), formatDates(counterpart.dates()),
dateOverlapped ? "Y" : "N");
Set<String> counterpartDispatchRegions = counterpart.dispatchRegions();
String sharedDispatchRegion = pair.dispatchRegions().stream()
.filter(counterpartDispatchRegions::contains)
.sorted()
.findFirst()
.orElse("");
boolean dateOverlapped = pair.dates().stream().anyMatch(counterpart.dates()::contains);
return new ABPairExcelDto(
groupId,
pair.fieldMemberId(),
pair.externalMemberId(),
counterpart.fieldMemberId(),
counterpart.externalMemberId(),
sharedDispatchRegion,
formatDates(pair.dates()),
formatDates(counterpart.dates()),
dateOverlapped ? "Y" : "N"
);
}
private List<CandidateSummaryExcelDto> createCandidateSummaries(PairingData data,
PairingCandidates candidates, int assignmentCount, int unassignedCenterCount,
int unusedMemberCount, int abGroupCount) {
long fieldMemberCount = data.getMembers().stream()
.filter((member) -> member.getRole().name().equals("FIELD")).count();
.filter(member -> member.getRole().name().equals("FIELD")).count();
long externalMemberCount = data.getMembers().stream()
.filter((member) -> member.getRole().name().equals("EXTERNAL")).count();
.filter(member -> member.getRole().name().equals("EXTERNAL")).count();
long womenOnlyCenterCount = data.getCenters().stream().filter(Center::isWomenOnly).count();
long noCandidateCenterCount = data.getCenters().stream().filter(
(center) -> candidates.getAssignmentCandidates().stream()
.noneMatch((candidate) -> candidate.getCenterId().equals(center.getId()))).count();
center -> candidates.getAssignmentCandidates().stream()
.noneMatch(candidate -> candidate.getCenterId().equals(center.getId()))).count();
return List.of(new CandidateSummaryExcelDto("전체 위원 수", String.valueOf(data.getMembers().size()),
"입력 위원 수"),
new CandidateSummaryExcelDto("현장위원 수", String.valueOf(fieldMemberCount), "현장위원 입력 수"),
@@ -457,16 +455,16 @@ public class PairingSolverService {
private List<RuleViolationExcelDto> createRuleChecks(PairingData data,
List<AssignmentCandidate> selectedAssignments, Map<String, ABPairMatch> abPairMatches) {
Map<String, Member> memberMap = (Map) data.getMembers().stream()
Map<String, Member> memberMap = data.getMembers().stream()
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
Map<String, Center> centerMap = (Map) data.getCenters().stream()
Map<String, Center> centerMap = data.getCenters().stream()
.collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
List<RuleViolationExcelDto> checks = new ArrayList();
List<RuleViolationExcelDto> checks = new ArrayList<>();
checks.add(checkDuplicate(
selectedAssignments.stream().map(AssignmentCandidate::getCenterId).toList(),
"한 센터 1회 초과 배정"));
checks.add(checkMaxGroupCount(selectedAssignments, this::pairDayKey,
pairingProperties.getRule().getMaxCentersPerPairPerDay(), "한 페어 하루 최대 센터 수"));
pairingProperties.getRule().getMaxCentersPerPairPerDay()));
checks.add(checkMemberDateDuplicate(selectedAssignments));
checks.add(checkPairDayAdjacentClassification(selectedAssignments));
checks.add(checkWomenOnly(selectedAssignments, memberMap, centerMap));
@@ -478,40 +476,43 @@ public class PairingSolverService {
}
private RuleViolationExcelDto checkDuplicate(List<String> values, String ruleName) {
Set<String> seen = new HashSet();
Set<String> duplicates = (Set) values.stream().filter((value) -> !seen.add(value))
Set<String> seen = new HashSet<>();
Set<String> duplicates = values.stream().filter(value -> !seen.add(value))
.collect(Collectors.toCollection(LinkedHashSet::new));
return new RuleViolationExcelDto(ruleName, duplicates.isEmpty() ? "PASS" : "FAIL",
duplicates.isEmpty() ? "위반 없음" : String.join(", ", duplicates));
}
private RuleViolationExcelDto checkMaxGroupCount(List<AssignmentCandidate> assignments,
Function<AssignmentCandidate, String> classifier, int max, String ruleName) {
Function<AssignmentCandidate, String> classifier, int max) {
Map<String, Long> countsByKey = assignments.stream()
.collect(Collectors.groupingBy(classifier, Collectors.counting()));
List<String> violations = countsByKey.entrySet().stream()
.filter((entry) -> entry.getValue() > (long) max).map((entry) -> {
.filter(entry -> entry.getValue() > max)
.map(entry -> {
String var10000 = entry.getKey();
return var10000 + "=" + String.valueOf(entry.getValue());
return var10000 + "=" + entry.getValue();
}).toList();
return new RuleViolationExcelDto(ruleName, violations.isEmpty() ? "PASS" : "FAIL",
return new RuleViolationExcelDto("한 페어 하루 최대 센터 수", violations.isEmpty() ? "PASS" : "FAIL",
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
}
private RuleViolationExcelDto checkMemberDateDuplicate(List<AssignmentCandidate> assignments) {
Map<String, Set<String>> pairKeysByMemberDate = new HashMap();
assignments.forEach((candidate) -> {
((Set) pairKeysByMemberDate.computeIfAbsent(
candidate.getFieldMemberId() + "|" + String.valueOf(candidate.getDate()),
(key) -> new HashSet())).add(pairKey(candidate));
((Set) pairKeysByMemberDate.computeIfAbsent(
candidate.getExternalMemberId() + "|" + String.valueOf(candidate.getDate()),
(key) -> new HashSet())).add(pairKey(candidate));
Map<String, Set<String>> pairKeysByMemberDate = new HashMap<>();
assignments.forEach(candidate -> {
pairKeysByMemberDate.computeIfAbsent(
candidate.getFieldMemberId() + "|" + candidate.getDate(),
key -> new HashSet<>()).add(pairKey(candidate));
pairKeysByMemberDate.computeIfAbsent(
candidate.getExternalMemberId() + "|" + candidate.getDate(),
key -> new HashSet<>()).add(pairKey(candidate));
});
List<String> violations = pairKeysByMemberDate.entrySet().stream()
.filter((entry) -> ((Set) entry.getValue()).size() > 1).map((entry) -> {
String var10000 = (String) entry.getKey();
return var10000 + "=" + String.join("/", (Iterable) entry.getValue());
.filter(entry -> (entry.getValue()).size() > 1)
.map(entry -> {
String var10000 = entry.getKey();
return var10000 + "=" + String.join("/", entry.getValue());
}).toList();
return new RuleViolationExcelDto("같은 위원 같은 날짜 중복", violations.isEmpty() ? "PASS" : "FAIL",
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
@@ -524,7 +525,7 @@ public class PairingSolverService {
Collectors.mapping(AssignmentCandidate::getAdjacentRegionClassification,
Collectors.toSet())));
List<String> violations = adjacentClassificationsByPairDay.entrySet().stream()
.filter((entry) -> entry.getValue().size() > 1).map((entry) -> {
.filter(entry -> entry.getValue().size() > 1).map(entry -> {
String var10000 = entry.getKey();
return var10000 + "=" + String.join("/", entry.getValue());
}).toList();
@@ -535,23 +536,24 @@ public class PairingSolverService {
private RuleViolationExcelDto checkWomenOnly(List<AssignmentCandidate> assignments,
Map<String, Member> memberMap, Map<String, Center> centerMap) {
List<String> violations = assignments.stream()
.filter((candidate) -> ((Center) centerMap.get(candidate.getCenterId())).isWomenOnly())
.filter((candidate) ->
((Member) memberMap.get(candidate.getFieldMemberId())).getGender() != Gender.FEMALE
|| ((Member) memberMap.get(candidate.getExternalMemberId())).getGender()
!= Gender.FEMALE).map(AssignmentCandidate::getCenterId).toList();
.filter(candidate -> centerMap.get(candidate.getCenterId()).isWomenOnly())
.filter(candidate ->
memberMap.get(candidate.getFieldMemberId()).getGender() != Gender.FEMALE ||
memberMap.get(candidate.getExternalMemberId()).getGender() != Gender.FEMALE
)
.map(AssignmentCandidate::getCenterId).toList();
return new RuleViolationExcelDto("여성 전용 센터 조건", violations.isEmpty() ? "PASS" : "FAIL",
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
}
private RuleViolationExcelDto checkActivityRegion(List<AssignmentCandidate> assignments,
Map<String, Member> memberMap) {
List<String> violations = assignments.stream().filter((candidate) ->
List<String> violations = assignments.stream().filter(candidate ->
hasActivityRegion(memberMap.get(candidate.getFieldMemberId()),
candidate.getDispatchRegion())
|| hasActivityRegion(memberMap.get(candidate.getExternalMemberId()),
candidate.getDispatchRegion()))
.map((candidate) -> {
.map(candidate -> {
String var10000 = candidate.getCenterId();
return var10000 + ":" + candidate.getDispatchRegion();
}).toList();
@@ -567,11 +569,16 @@ public class PairingSolverService {
private RuleViolationExcelDto checkHistoryCenter(List<AssignmentCandidate> assignments,
Map<String, Member> memberMap) {
List<String> violations = assignments.stream().filter((candidate) ->
((Member) memberMap.get(candidate.getFieldMemberId())).getHistoryCenterIds()
.contains(candidate.getCenterId()) || ((Member) memberMap.get(
candidate.getExternalMemberId())).getHistoryCenterIds()
.contains(candidate.getCenterId())).map(AssignmentCandidate::getCenterId).toList();
List<String> violations = assignments.stream().filter(candidate ->
memberMap.get(candidate.getFieldMemberId())
.getHistoryCenterIds()
.contains(candidate.getCenterId()) ||
memberMap.get(candidate.getExternalMemberId())
.getHistoryCenterIds()
.contains(candidate.getCenterId())
)
.map(AssignmentCandidate::getCenterId).toList();
return new RuleViolationExcelDto("2023년 진행 센터 재배정", violations.isEmpty() ? "PASS" : "FAIL",
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
}
@@ -579,9 +586,10 @@ public class PairingSolverService {
private RuleViolationExcelDto checkHoliday(List<AssignmentCandidate> assignments,
Set<LocalDate> holidays) {
List<String> violations = assignments.stream()
.filter((candidate) -> holidays.contains(candidate.getDate())).map((candidate) -> {
.filter(candidate -> holidays.contains(candidate.getDate()))
.map(candidate -> {
String var10000 = candidate.getCenterId();
return var10000 + ":" + String.valueOf(candidate.getDate());
return var10000 + ":" + candidate.getDate();
}).toList();
return new RuleViolationExcelDto("공휴일 배정", violations.isEmpty() ? "PASS" : "FAIL",
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
@@ -603,25 +611,25 @@ public class PairingSolverService {
private Map<String, List<Integer>> groupIndexes(List<AssignmentCandidate> candidates,
Function<AssignmentCandidate, String> classifier) {
Map<String, List<Integer>> grouped = new HashMap();
Map<String, List<Integer>> grouped = new HashMap<>();
for (int i = 0; i < candidates.size(); ++i) {
((List) grouped.computeIfAbsent(
(String) classifier.apply((AssignmentCandidate) candidates.get(i)),
(key) -> new ArrayList())).add(i);
(grouped.computeIfAbsent(
classifier.apply(candidates.get(i)),
key -> new ArrayList<>())).add(i);
}
return grouped;
}
private BoolVar[] toLiteralArray(List<Integer> indexes, BoolVar[] assignmentVars) {
return (BoolVar[]) indexes.stream().map((index) -> assignmentVars[index])
.toArray((x$0) -> new BoolVar[x$0]);
return indexes.stream().map(index -> assignmentVars[index])
.toArray(BoolVar[]::new);
}
private LinearArgument[] toLinearArgumentArray(List<Integer> indexes, BoolVar[] assignmentVars) {
return (LinearArgument[]) indexes.stream().map((index) -> assignmentVars[index])
.toArray((x$0) -> new LinearArgument[x$0]);
return indexes.stream().map(index -> assignmentVars[index])
.toArray(LinearArgument[]::new);
}
private String pairKey(AssignmentCandidate candidate) {
@@ -631,7 +639,7 @@ public class PairingSolverService {
private String pairDayKey(AssignmentCandidate candidate) {
String var10000 = pairKey(candidate);
return var10000 + "|" + String.valueOf(candidate.getDate());
return var10000 + "|" + candidate.getDate();
}
private String pairDayAdjacentKey(AssignmentCandidate candidate) {
@@ -649,38 +657,23 @@ public class PairingSolverService {
}
private static record UsedPair(String pairKey, String fieldMemberId, String externalMemberId,
Set<LocalDate> dates, Set<String> dispatchAdjacentKeys) {
Set<LocalDate> dates, Set<String> dispatchRegions) {
private static UsedPair of(String pairKey, List<AssignmentCandidate> assignments) {
AssignmentCandidate first = (AssignmentCandidate) assignments.get(0);
AssignmentCandidate first = assignments.get(0);
return new UsedPair(pairKey, first.getFieldMemberId(), first.getExternalMemberId(),
(Set) assignments.stream().map(AssignmentCandidate::getDate).collect(Collectors.toSet()),
(Set) assignments.stream().map((candidate) -> {
String var10000 = candidate.getDispatchRegion();
return var10000 + "|" + candidate.getAdjacentRegionClassification();
}).collect(Collectors.toSet()));
assignments.stream().map(AssignmentCandidate::getDate).collect(Collectors.toSet()),
assignments.stream().map(AssignmentCandidate::getDispatchRegion)
.collect(Collectors.toSet()));
}
private boolean canBeABWith(UsedPair other) {
Stream var10000 = dates.stream();
Set var10001 = other.dates;
Objects.requireNonNull(var10001);
boolean var3;
if (var10000.noneMatch(var10001::contains)) {
Stream var2 = dispatchAdjacentKeys.stream();
var10001 = other.dispatchAdjacentKeys;
Objects.requireNonNull(var10001);
if (var2.anyMatch(var10001::contains) && !Objects.equals(fieldMemberId,
other.fieldMemberId) && !Objects.equals(fieldMemberId, other.externalMemberId)
&& !Objects.equals(externalMemberId, other.fieldMemberId) && !Objects.equals(
externalMemberId, other.externalMemberId)) {
var3 = true;
return var3;
}
}
var3 = false;
return var3;
return dates.stream().noneMatch(other.dates::contains)
&& dispatchRegions.stream().anyMatch(other.dispatchRegions::contains)
&& !Objects.equals(fieldMemberId, other.fieldMemberId)
&& !Objects.equals(fieldMemberId, other.externalMemberId)
&& !Objects.equals(externalMemberId, other.fieldMemberId)
&& !Objects.equals(externalMemberId, other.externalMemberId);
}
}
}

View File

@@ -46,7 +46,7 @@ kri:
pairing:
excel:
# ExcelMapper에서 헤더가 위치한 행 번호입니다. 공통 라이브러리 기준 1부터 시작합니다.
# ExcelMapper에서 헤더가 위치한 행 번호입니다. 공통 라이브러리 기준 1부터 시작합니다.(HARD)
header-row-index: 1
code:
# 활동지역, 선호지역, 파견 권역처럼 권역 비교에 사용하는 코드 길이입니다.
@@ -58,14 +58,14 @@ pairing:
# 선호지역에서 "어디든 가능"을 의미하는 코드입니다.
any-region-code: "00"
rule:
# 한 페어가 하루에 방문할 수 있는 최대 센터 수입니다.
# 한 페어가 하루에 방문할 수 있는 최대 센터 수입니다. (HARD)
max-centers-per-pair-per-day: 3
# 한 위원이 전체 기간 동안 가질 수 있는 최대 상대 파트너 수입니다.
# 한 위원이 전체 기간 동안 가질 수 있는 최대 상대 파트너 수입니다.(HARD)
max-counterparts-per-member: 2
preference:
# 선호지역 00(anywhere)을 희망지역 매칭표에서 표현하는 rank 값입니다.
# 선호지역 00(anywhere)을 희망지역 매칭표에서 표현하는 rank 값입니다.(HARD)
anywhere-rank: 0
# 희망지역 매칭표에서 해당 위원의 선호지역을 고려하지 않는 wildcard rank 값입니다.
# 희망지역 매칭표에서 해당 위원의 선호지역을 고려하지 않는 wildcard rank 값입니다.(HARD)
ignored-rank: 99
objective:
# 센터 1개를 배정했을 때 부여하는 최우선 점수입니다. 다른 soft score 총합보다 충분히 커야 합니다.
@@ -78,13 +78,13 @@ pairing:
residence-match-weight: 10000
candidate:
# 현장+외부 페어 1개가 solver에 넘기기 전에 유지할 최대 파견 권역 후보 수입니다.
max-dispatch-regions-per-pair: 5
max-dispatch-regions-per-pair: 8
# 센터 1개마다 solver에 넘기기 전에 유지할 최대 배정 후보 수입니다.
max-assignments-per-center: 30
max-assignments-per-center: 100
# 위원 1명(현장/외부 모두 포함)이 solver 후보에 등장할 수 있는 최대 횟수입니다.
max-assignments-per-member: 80
max-assignments-per-member: 160
solver:
# OR-Tools CP-SAT solver가 한 요청에서 탐색할 최대 시간(초)입니다.
max-time-seconds: 30.0
max-time-seconds: 60.0
# OR-Tools CP-SAT 병렬 탐색 worker 수입니다. 서버 CPU 상황에 맞춰 조정합니다.
num-search-workers: 15