Skip to content
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

Jump to bottom

Avoid using merge_nodes by default #4647

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Avoid using merge_nodes by default #4647

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
c3d249b
default: don't use merge_nodes, because they provide a more abstract …
Stevengre Sep 23, 2024
4f80e34
fix test
Stevengre Sep 23, 2024
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: 2 additions & 2 deletions pyk/src/pyk/kcfg/minimize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def _is_mergeable(x: KCFG.Edge | KCFG.MergedEdge, y: KCFG.Edge | KCFG.MergedEdge

return True

def minimize(self) -> None:
def minimize(self, merge: bool = False) -> None:
"""Minimize KCFG by repeatedly performing the lifting transformations.

The KCFG is transformed to an equivalent in which no further lifting transformations are possible.
Expand All @@ -300,5 +300,5 @@ def minimize(self) -> None:
repeat = self.lift_splits() or repeat

repeat = True
while repeat:
while repeat and merge:
repeat = self.merge_nodes()
4 changes: 2 additions & 2 deletions pyk/src/tests/unit/kcfg/merge_node_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,12 @@ def util_check_constraint(constraint: KInner, merged_var: KVariable, under_check


def check_merge_no(minimizer: KCFGMinimizer) -> None:
minimizer.minimize()
minimizer.minimize(merge=True)
assert minimizer.kcfg.to_dict() == merge_node_test_kcfg().to_dict()


def check_merged_one(minimizer: KCFGMinimizer) -> None:
minimizer.minimize()
minimizer.minimize(merge=True)
# 1 --> merged bi: Merged Edge
merged_edge = single(minimizer.kcfg.merged_edges(source_id=1))
edges = {2: 9, 3: 10, 16: 20, 17: 21, 18: 22, 19: 23, 6: 13, 7: 14, 8: 15}
Expand Down
Loading