Skip to content

Fix minimization missing last empty branch #2288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IlyaMuravjov merged 1 commit into from
Jun 19, 2023
Merged

Fix minimization missing last empty branch #2288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions utbot-framework/src/main/kotlin/org/utbot/framework/minimization/Minimization.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ private fun groupByBranchInstructions(
executions: List<UtExecution>,
branchInstructionsNumber: Int
): Collection<List<UtExecution>> {
val instructionToPossibleNextInstructions = mutableMapOf<Long, MutableSet<Long>>()
val instructionToPossibleNextInstructions = mutableMapOf<Long, MutableSet<Long?>>()

for (execution in executions) {
execution.coverage?.let { coverage ->
val coveredInstructionIds = coverage.coveredInstructions.map { it.id }
for (i in 0 until coveredInstructionIds.size - 1) {
for (i in coveredInstructionIds.indices) {
instructionToPossibleNextInstructions
.getOrPut(coveredInstructionIds[i]) { mutableSetOf() }
.add(coveredInstructionIds[i + 1])
.add(coveredInstructionIds.getOrNull(i + 1))
}
}
}
Expand Down Expand Up @@ -153,7 +153,7 @@ private fun <T : Any> groupExecutionsByTestSuite(
*/
private fun buildMapping(executions: List<UtExecution>): Pair<Map<Int, List<Int>>, Map<Int, Int>> {
// (inst1, instr2) -> edge id --- edge represents as a pair of instructions, which are connected by this edge
val allCoveredEdges = mutableMapOf<Pair<Long, Long>, Int>()
val allCoveredEdges = mutableMapOf<Pair<Long, Long?>, Int>()
val thrownExceptions = mutableMapOf<String, Long>()
val mapping = mutableMapOf<Int, List<Int>>()
val executionToPriorityMapping = mutableMapOf<Int, Int>()
Expand All @@ -167,14 +167,10 @@ private fun buildMapping(executions: List<UtExecution>): Pair<Map<Int, List<Int>
execution.result,
thrownExceptions
).let { instructions ->
for (i in 0 until instructions.size - 1) {
allCoveredEdges.putIfAbsent(instructions[i] to instructions[i + 1], allCoveredEdges.size)
val edges = instructions.indices.map { i ->
allCoveredEdges.getOrPut(instructions[i] to instructions.getOrNull(i + 1)) { allCoveredEdges.size }
}

val edges = mutableListOf<Int>()
for (i in 0 until instructions.size - 1) {
edges += allCoveredEdges[instructions[i] to instructions[i + 1]]!!
}
mapping[idx] = edges
executionToPriorityMapping[idx] = execution.getExecutionPriority()
}
Expand Down