Skip to content

Cache more things in set generation and be more lazy about explain #67

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
MaximilianAlgehed merged 2 commits into from
Nov 26, 2025
Merged

Cache more things in set generation and be more lazy about explain #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
778fca2
cache more things in set generation and be more lazy about `explain`
MaximilianAlgehed Nov 24, 2025
c672d5e
Merge branch 'master' into avoid-forcing-explanations
MaximilianAlgehed Nov 26, 2025
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
4 changes: 1 addition & 3 deletions src/Constrained/GenT.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,7 @@ fatalError = fatalErrorNE . pure

-- | Attach an explanation to a computation in case of error
explain :: MonadGenError m => String -> m a -> m a
explain s
| null s = id
| otherwise = explainNE (pure s)
explain = explainNE . pure

-- GE instance

Expand Down
10 changes: 6 additions & 4 deletions src/Constrained/Spec/Set.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ instance (Ord a, HasSpec a) => HasSpec (Set a) where
size <- fromInteger <$> genFromSpecT szSpec'
let additions = Set.fromList $ take (size - Set.size must) choices
pure (Set.union must additions)
genFromTypeSpec (SetSpec must elemS szSpec) = do
let szSpec' = szSpec <> geqSpec (sizeOf must) <> maxSpec (cardinality elemS)
genFromTypeSpec (SetSpec must (simplifySpec -> elemS) szSpec) = do
let szSpec' = szSpec <> geqSpec (sizeOf must) <> maxSpec cardinalityElem
chosenSize <-
explain "Choose a size for the Set to be generated" $
genFromSpecT szSpec'
Expand All @@ -176,7 +176,9 @@ instance (Ord a, HasSpec a) => HasSpec (Set a) where
GT -> go 100 targetSize must
EQ -> go 100 targetSize must
where
theMostWeCanExpect = maxFromSpec 0 (cardinality (simplifySpec elemS))
cardinalityElem = cardinality elemS
theMostWeCanExpect = maxFromSpec 0 cardinalityElem
genElem = genFromSpecT elemS
go _ n s | n <= 0 = pure s
go tries n s = do
e <-
Expand All @@ -190,7 +192,7 @@ instance (Ord a, HasSpec a) => HasSpec (Set a) where
]
)
$ withMode Strict
$ suchThatWithTryT tries (genFromSpecT elemS) (`Set.notMember` s)
$ suchThatWithTryT tries genElem (`Set.notMember` s)

go tries (n - 1) (Set.insert e s)

Expand Down