@@ -245,7 +245,7 @@ tryToMinimizeConflictSet :: forall a . (SolverConfig -> RetryLog SummarizedMessa
245
245
-> ConflictMap
246
246
-> RetryLog SummarizedMessage SolverFailure a
247
247
tryToMinimizeConflictSet runSolver sc cs cm =
248
- foldl (\ r v -> retryMap mkErrorMsg $ retryNoSolution (retryMap renderSummarizedMessage r) $ tryToRemoveOneVar v)
248
+ foldl (\ r v -> retryNoSolution r $ tryToRemoveOneVar v)
249
249
(fromProgress $ Fail $ ExhaustiveSearch cs cm)
250
250
(CS. toList cs)
251
251
where
@@ -269,14 +269,14 @@ tryToMinimizeConflictSet runSolver sc cs cm =
269
269
tryToRemoveOneVar :: Var QPN
270
270
-> ConflictSet
271
271
-> ConflictMap
272
- -> RetryLog String SolverFailure a
272
+ -> RetryLog SummarizedMessage SolverFailure a
273
273
tryToRemoveOneVar v smallestKnownCS smallestKnownCM
274
274
-- Check whether v is still present, because it may have already been
275
275
-- removed in a previous solver rerun.
276
276
| not (v `CS.member` smallestKnownCS) =
277
277
fromProgress $ Fail $ ExhaustiveSearch smallestKnownCS smallestKnownCM
278
278
| otherwise =
279
- continueWith (" Trying to remove variable " ++ varStr ++ " from the "
279
+ retryMap mkErrorMsg $ continueWith (" Trying to remove variable " ++ varStr ++ " from the "
280
280
++ " conflict set." ) $
281
281
retry (retryMap renderSummarizedMessage $ runSolver sc') $ \ case
282
282
err@ (ExhaustiveSearch cs' _)
@@ -310,9 +310,9 @@ tryToMinimizeConflictSet runSolver sc cs cm =
310
310
311
311
-- Like 'retry', except that it only applies the input function when the
312
312
-- backjump limit has not been reached.
313
- retryNoSolution :: RetryLog step SolverFailure done
314
- -> (ConflictSet -> ConflictMap -> RetryLog step SolverFailure done )
315
- -> RetryLog step SolverFailure done
313
+ retryNoSolution :: RetryLog SummarizedMessage SolverFailure done
314
+ -> (ConflictSet -> ConflictMap -> RetryLog SummarizedMessage SolverFailure done )
315
+ -> RetryLog SummarizedMessage SolverFailure done
316
316
retryNoSolution lg f = retry lg $ \ case
317
317
ExhaustiveSearch cs' cm' -> f cs' cm'
318
318
BackjumpLimitReached -> fromProgress (Fail BackjumpLimitReached )
0 commit comments