Skip to content

modify AC3 algorithm #717

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 5 commits into from
Feb 12, 2018
Merged

modify AC3 algorithm #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
341557b
added submodule
nvinayvarma189 Feb 7, 2018
35cfcd2
Merge remote-tracking branch 'upstream/master'
nvinayvarma189 Feb 9, 2018
b9a1e97
fixed ac3 in csp.py
nvinayvarma189 Feb 9, 2018
1c517dd
added a test to verify the modified ac3 algorithm in csp.py
nvinayvarma189 Feb 9, 2018
1861dab
Update .gitmodules
nvinayvarma189 Feb 11, 2018
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
2 changes: 1 addition & 1 deletion csp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def AC3(csp, queue=None, removals=None):
if not csp.curr_domains[Xi]:
return False
for Xk in csp.neighbors[Xi]:
if Xk != Xi:
if Xk != Xj:
queue.append((Xk, Xi))
return True

Expand Down
7 changes: 7 additions & 0 deletions tests/test_csp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ def test_AC3():
assert AC3(csp, removals=removals) is True
assert (removals == [('A', 1), ('A', 3), ('B', 1), ('B', 3)] or
removals == [('B', 1), ('B', 3), ('A', 1), ('A', 3)])

domains = {'A': [ 2, 4], 'B': [ 3, 5]}
constraints = lambda X, x, Y, y: int(x) > int (y)
removals=[]
csp = CSP(variables=None, domains=domains, neighbors=neighbors, constraints=constraints)

assert AC3(csp, removals=removals)


def test_first_unassigned_variable():
Expand Down