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.

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

moved util functions to utils.py, moved probability learners from learning.py to probabilistic_learning.py with tests, fixed typos and fixed imports in .ipynb files #1120

Merged
merged 97 commits into from
Oct 7, 2019

Conversation

dmeoli
Copy link
Contributor

@dmeoli dmeoli commented Oct 3, 2019

No description provided.

Changed queue to set in AC3 (as in the pseudocode of the original algorithm) to reduce the number of consistency-check due to the redundancy of the same arcs in queue. For example, on the harder1 configuration of the Sudoku CSP the number consistency-check has been reduced from 40464 to 12562!
AC3 algorithm has non-optimal worst case time-complexity O(cd^3 ), while AC4 algorithm runs in O(cd^2) worst case time
…he constant propagation algorithm in mac inference
… are already present in test_csp.py"

This reverts commit b3cd24c.
…oosing the constant propagation algorithm in mac inference"

This reverts commit 6986247.
This reverts commit 6641c2c.
@dmeoli dmeoli changed the title moved utils function to utils.py, separated probability learning code from learning.py, fixed typos and fixed imports in .ipynb files moved util functions to utils.py, moved probability learners from learning.py to probabilitu_learning.py with tests, fixed typos and imports in .ipynb files Oct 3, 2019
@antmarakis antmarakis closed this Oct 3, 2019
@antmarakis antmarakis reopened this Oct 3, 2019
@dmeoli dmeoli changed the title moved util functions to utils.py, moved probability learners from learning.py to probabilitu_learning.py with tests, fixed typos and imports in .ipynb files moved util functions to utils.py, moved probability learners from learning.py to probability_learning.py with tests, fixed typos and imports in .ipynb files Oct 3, 2019
@dmeoli dmeoli changed the title moved util functions to utils.py, moved probability learners from learning.py to probability_learning.py with tests, fixed typos and imports in .ipynb files moved util functions to utils.py, moved probability learners from learning.py to probabilistic_learning.py with tests, fixed typos and fixed imports in .ipynb files Oct 3, 2019
@antmarakis
Copy link
Collaborator

There are some minor conflicts, if you could fix those it would be great. Also, I am going to wait a couple of days for Travis to stop malfunctioning.

@antmarakis antmarakis merged commit 283fa41 into aimacode:master Oct 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants