Skip to content

Clean up Kore.Step.Simplification.Condition #2679

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
merged 2 commits into from
Jun 21, 2021
Merged

Clean up Kore.Step.Simplification.Condition #2679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0539443
[REF] simplifyPredicatesWithAssumptions: Return MultiAnd
ttuegel Jun 16, 2021
f82bd67
Clean up simplifyPredicatesWithAssumptions
ttuegel Jun 16, 2021
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
46 changes: 23 additions & 23 deletions kore/src/Kore/Step/Simplification/Condition.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,11 @@ simplifyPredicates sideCondition original = do
let predicates =
SideCondition.simplifyConjunctionByAssumption original
& fst . extract
simplified <-
simplifiedPredicates <-
simplifyPredicatesWithAssumptions
sideCondition
(toList predicates)
let simplifiedPredicates =
from @(Condition _) @(MultiAnd (Predicate _)) simplified
let simplified = foldMap mkCondition simplifiedPredicates
if original == simplifiedPredicates
then return (Condition.markSimplified simplified)
else simplifyPredicates sideCondition simplifiedPredicates
Expand All @@ -157,19 +156,14 @@ simplifyPredicatesWithAssumptions ::
[Predicate RewritingVariableName] ->
LogicT
simplifier
(Condition RewritingVariableName)
simplifyPredicatesWithAssumptions _ [] = return Condition.top
(MultiAnd (Predicate RewritingVariableName))
simplifyPredicatesWithAssumptions _ [] = return MultiAnd.top
simplifyPredicatesWithAssumptions sideCondition predicates@(_ : rest) = do
let predicatesWithUnsimplified =
zip predicates $
scanr ((<>) . MultiAnd.singleton) MultiAnd.top rest
State.execStateT
( traverse_
simplifyWithAssumptions
predicatesWithUnsimplified
)
MultiAnd.top
& fmap (foldMap mkCondition)
let unsimplifieds =
map MultiAnd.singleton rest
& scanr (<>) MultiAnd.top
traverse_ simplifyWithAssumptions (zip predicates unsimplifieds)
& flip State.execStateT MultiAnd.top
where
simplifyWithAssumptions ::
( Predicate RewritingVariableName
Expand All @@ -180,15 +174,21 @@ simplifyPredicatesWithAssumptions sideCondition predicates@(_ : rest) = do
(LogicT simplifier)
()
simplifyWithAssumptions (predicate, unsimplifiedSideCond) = do
sideCondition' <- getSideCondition unsimplifiedSideCond
result <- simplifyPredicate sideCondition' predicate
putSimplifiedResult result

getSideCondition unsimplifiedSideCond = do
simplifiedSideCond <- State.get
let otherSideConds =
SideCondition.addAssumptions
(simplifiedSideCond <> unsimplifiedSideCond)
sideCondition
result <-
Predicate.simplify otherSideConds predicate >>= Logic.scatter
& lift
State.put (simplifiedSideCond <> result)
SideCondition.addAssumptions
(simplifiedSideCond <> unsimplifiedSideCond)
sideCondition
& return

putSimplifiedResult result = State.modify' (<> result)

simplifyPredicate sideCondition' predicate =
Predicate.simplify sideCondition' predicate >>= Logic.scatter & lift

mkCondition ::
InternalVariable variable =>
Expand Down