Commit e30ffcb2 authored by kristenk's avatar kristenk Committed by GitHub
Browse files

Merge pull request #3961 from fmthoma/fmthoma/fix-counting-backjumps

Fix conflict counting bug
parents 69424603 6c00067c
...@@ -60,7 +60,10 @@ backjump (EnableBackjumping enableBj) var initial xs = ...@@ -60,7 +60,10 @@ backjump (EnableBackjumping enableBj) var initial xs =
| otherwise = f (csAcc `CS.union` cs) cm' | otherwise = f (csAcc `CS.union` cs) cm'
logBackjump :: ConflictSet QPN -> ConflictMap -> ConflictSetLog a logBackjump :: ConflictSet QPN -> ConflictMap -> ConflictSetLog a
logBackjump cs cm = failWith (Failure cs Backjump) (cs, cm) logBackjump cs cm = failWith (Failure cs Backjump) (cs, updateCM initial cm)
-- 'intial' instead of 'cs' here ---^
-- since we do not want to double-count the
-- additionally accumulated conflicts.
type ConflictSetLog = RetryLog Message (ConflictSet QPN, ConflictMap) type ConflictSetLog = RetryLog Message (ConflictSet QPN, ConflictMap)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment