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

milestone/nogoods #74

Merged
merged 54 commits into from
Aug 2, 2022
Merged

milestone/nogoods #74

merged 54 commits into from
Aug 2, 2022

Conversation

ellmau
Copy link
Owner

@ellmau ellmau commented Jun 15, 2022 •
edited
Loading

What does this PR do?

Implementation of an alternative NoGoodStore to easier learn and imply conclusions.

Update to version 0.2.5

Checklist before creating a non-draft PR

  • All tests are passing
  • Clippy has no complains
  • Code is rustfmt formatted
  • Applicable labels are chosen (Note: it is not necessary to replicate the labels from the related issues)
  • There are no other open Pull Requests for the same update/change.
    • If there is a good reason to have another PR for the same update/change, it is well justified.

Checklist on Guidelines and Conventions

  • Commit messages follow our guidelines
  • Code is self-reviewed
  • Naming conventions are met
  • New features are tested
    • quickcheck has been considered
    • All variants are considered and checked
  • Clippy Compiler-exceptions
    • Used in a sparse manner
    • If used, a separate comment describes and justifies its use
  • rustdoc comments are self-reviewed and descriptive
  • Error handling
    • Use of panic!(...) applications is justified on non-recoverable situations
    • expect(...) is used over unwrap() (except obvious test-cases)
  • No unsafe code (exceptions need to be discussed specifically)

@ellmau
Add NoGood and NoGoodStore (#65)
9d0845c 
* Add NoGood and NoGoodStore with basic functionality
@ellmau ellmau added enhancement New feature or request binary This issue or pull request is related to the binary library This issue or pull request is related to the library labels Jun 15, 2022
@ellmau ellmau added this to the Nogood optimisation milestone Jun 15, 2022
ellmau added 12 commits June 15, 2022 17:43
@ellmau
Fix issue with nogoods module definition in lib
795d8ab
@ellmau
Fix issues with inconsistencies
4eb54e7
@ellmau
Add closure of conclusions of an interpretation and a NoGoodStore
8059590
@ellmau
flake.lock: Update
ced0b3a 
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/04c1b180862888302ddfb2e3ad9eaa63afc60cf8' (2022-05-17)
  → 'github:numtide/flake-utils/1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1' (2022-05-30)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/dfd82985c273aac6eced03625f454b334daae2e8' (2022-05-20)
  → 'github:NixOS/nixpkgs/b1957596ff1c7aa8c55c4512b7ad1c9672502e8e' (2022-06-15)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/c5486f823e4af2c0dfb5b2673002d5c973ef5209' (2022-05-24)
  → 'github:oxalica/rust-overlay/9eea93067eff400846c36f57b7499df9ef428ba0' (2022-06-17)
@ellmau
Update Flake to nix 22.05
670a604
@ellmau
Add nogood-algorithm to the ADF
3ce1b54 
add additional test cases, fixed a bug in the ng-learner module
@ellmau
Fix typo in Readme
f6f922d
@ellmau
Add public api for the nogood-learner
fa9e622 
Increment of the patch-version of the crate
Add public enum to comfortably choose a heuristics function
@ellmau
Add missing heuristics module to git
dece879
@ellmau
Fix rustfmt
57cdb46
@ellmau
Update to trigger a new rustfmt
273973f 
The rustfmt issue on the CI is not reproducable
@ellmau
Updated rustfmt to match the version on the server-CI
f99d617
mmarx
mmarx reviewed Jun 21, 2022
View reviewed changes
lib/src/nogoods.rs Outdated Show resolved Hide resolved
ellmau
ellmau commented Jun 21, 2022
View reviewed changes
Copy link
Owner Author

@ellmau ellmau left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Nice refactor to avoid the box and allow a functionpointer to be responsible as the heuristics functions.

@ellmau ellmau self-assigned this Jun 21, 2022
@ellmau
Add ng option with heu to binary
86084d7 
Fix various bugs with the nogood learner
@ellmau
Copy link
Owner Author

ellmau commented Jun 22, 2022

Next step:

the consistency of choices and learnt information should be verified with respect to the adf more often to avoid local hill optimisation effects

@ellmau
Optimise ng learner further on and fix a verification bug
4eabf16 
Introduce a new flag to handle big instances (modelcount vs adhoccount)
@ellmau
Fix tests, which are changed due to the new feature flag
0dc35d3
@ellmau
Add new heuristic
55e6c30 
maxvarimp_minpaths has been implemented
@ellmau ellmau added the RC Pull request will introduce a new version label Jul 26, 2022
@ellmau ellmau requested a review from mmarx July 26, 2022 10:07
ellmau and others added 19 commits July 26, 2022 12:19
@ellmau
Add metadata to bin/Cargo.toml, add features
e1b9eeb 
added a benchmark feature, to easily compile benchmark-releases
@ellmau
Fix facet count tests
00674f7
@ellmau
Add multithread-safe functionality for the dictionary/ordering
84aa627 
* Streamline a couple of API calls
* Expose more structs and methods to the public API
* Breaking some API (though nothing which is currently used in the binary)
@ellmau
Add first documentation structure
c531413
@ellmau
mv gh-pages to docs
65de129
@ellmau
Fix docs string
b38c64a
@ellmau
Simple version of gh pages
d4465fe
@ellmau
Fix some style issues
2b86e74
@ellmau
Added more links and information to the landing page
fa52a02
@ellmau
Fix badges in the app-doc
30c0ca6
@ellmau
Add two valued interpretation
44d41ec 
Parameterised the stable-nogood algorithm to allow a variable
stability check function.
@ellmau
Refactor nogood-algorithm name
e2e77ea
@ellmau
Update README.md
ab515e6 
`README.md` on the `/` level is now presenting the same information
which is provided in `docs/index.md`
@ellmau
Fix link to binary and library subfolder
5fc720d
@ellmau
Update main
20131d7 
- Update main functionality
- Update naming
- Update README/Documentation
@ellmau
Fix cli-test
c234bd4 
Update name in cli test for the testing of the binary
@ellmau
Update lib/README to match lib-documentation
deb7282
@ellmau
Update Version to 0.3.0
e70d55f 
Due to braking API changes and reaching a milestone, the version is
incremented to
0.3.0 (beta)
@ellmau
Update Documentation navigation (#81)
e4c5718 
* Update index.md
* Update adf_bdd.md
* Update adf-bdd.md
mmarx
mmarx requested changes Aug 1, 2022
View reviewed changes
Copy link
Collaborator

@mmarx mmarx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lmgtm, I just have a few remarx.

lib/src/adf.rs Outdated Show resolved Hide resolved
lib/src/nogoods.rs Outdated Show resolved Hide resolved
lib/src/nogoods.rs Outdated Show resolved Hide resolved
lib/src/nogoods.rs Outdated Show resolved Hide resolved
lib/src/nogoods.rs Outdated Show resolved Hide resolved
ellmau and others added 5 commits August 1, 2022 23:42
@ellmau
Merge branch 'main' into milestone/nogoods
c276372
@ellmau
flake.lock: Update
fac10dd 
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1' (2022-05-30)
  → 'github:numtide/flake-utils/7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249' (2022-07-04)
• Updated input 'gitignoresrc':
    'github:hercules-ci/gitignore.nix/bff2832ec341cf30acb3a4d3e2e7f1f7b590116a' (2022-03-05)
  → 'github:hercules-ci/gitignore.nix/f2ea0f8ff1bce948ccb6b893d15d5ea3efaf1364' (2022-07-21)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8b538fcb329a7bc3d153962f17c509ee49166973' (2022-06-15)
  → 'github:NixOS/nixpkgs/e43cf1748462c81202a32b26294e9f8eefcc3462' (2022-08-01)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/b1957596ff1c7aa8c55c4512b7ad1c9672502e8e' (2022-06-15)
  → 'github:NixOS/nixpkgs/7b9be38c7250b22d829ab6effdee90d5e40c6e5c' (2022-07-30)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/9eea93067eff400846c36f57b7499df9ef428ba0' (2022-06-17)
  → 'github:oxalica/rust-overlay/9055cb4f33f062c0dd33aa7e3c89140da8f70057' (2022-08-02)
@ellmau
Add type alias for NoGood
b3b2632 
Add a type alias `Interpretation` for NoGood to reflect the duality
where an Interpretation might become a NoGood.
@ellmau
Apply review comments
154b975
@ellmau
Add documentation information about later revisions on VarContainer
5bada6f
@ellmau ellmau merged commit d7e71e5 into main Aug 2, 2022
@ellmau ellmau deleted the milestone/nogoods branch August 2, 2022 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmarx mmarx mmarx approved these changes

Assignees

@ellmau ellmau

Labels
binary This issue or pull request is related to the binary enhancement New feature or request library This issue or pull request is related to the library RC Pull request will introduce a new version
Projects
ADF-OBDD
Status: Done
Milestone
Nogood optimisation
Development

Successfully merging this pull request may close these issues.

Alternative NoGoodLearning with the newly created NoGood representations Representation of nogoods
2 participants
@ellmau @mmarx