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

milestone/nogoods #74

Merged
merged 54 commits into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9d0845c
Add NoGood and NoGoodStore (#65)
ellmau Jun 15, 2022
795d8ab
Fix issue with nogoods module definition in lib
ellmau Jun 15, 2022
4eb54e7
Fix issues with inconsistencies
ellmau Jun 16, 2022
8059590
Add closure of conclusions of an interpretation and a NoGoodStore
ellmau Jun 17, 2022
ced0b3a
flake.lock: Update
ellmau Jun 17, 2022
670a604
Update Flake to nix 22.05
ellmau Jun 17, 2022
3ce1b54
Add nogood-algorithm to the ADF
ellmau Jun 20, 2022
f6f922d
Fix typo in Readme
ellmau Jun 21, 2022
fa9e622
Add public api for the nogood-learner
ellmau Jun 21, 2022
dece879
Add missing heuristics module to git
ellmau Jun 21, 2022
57cdb46
Fix rustfmt
ellmau Jun 21, 2022
273973f
Update to trigger a new rustfmt
ellmau Jun 21, 2022
f99d617
Updated rustfmt to match the version on the server-CI
ellmau Jun 21, 2022
e78cd57
Update lib/src/nogoods.rs
ellmau Jun 21, 2022
e7f38c1
Fix rustfmt
ellmau Jun 21, 2022
e7d9291
Add direnv to gitignore
ellmau Jun 21, 2022
d68d6cc
Ignore perf data (gitignore)
ellmau Jun 21, 2022
5da2c2c
Avoid a Box, support custom heuristics functions
mmarx Jun 21, 2022
86084d7
Add ng option with heu to binary
ellmau Jun 22, 2022
4eabf16
Optimise ng learner further on and fix a verification bug
ellmau Jun 23, 2022
0dc35d3
Fix tests, which are changed due to the new feature flag
ellmau Jun 23, 2022
55e6c30
Add new heuristic
ellmau Jun 24, 2022
83b403b
Modified heuristics
ellmau Jun 24, 2022
7726d27
Merge remote-tracking branch 'origin/main' into milestone/nogoods
ellmau Jul 18, 2022
c6f112b
Add crossbeam-channel to represent an output-stream of stable models
ellmau Jul 26, 2022
80e1ca9
Add test-case to show multi-threaded use of the ng solver
ellmau Jul 26, 2022
6215573
Add better test coverage
ellmau Jul 26, 2022
ea10436
Fix broken links in rust-doc
ellmau Jul 26, 2022
1163f30
Update Readme for lib to reflect the new NoGood API
ellmau Jul 26, 2022
92a53c4
Merge branch 'main' into milestone/nogoods
ellmau Jul 26, 2022
e1b9eeb
Add metadata to bin/Cargo.toml, add features
ellmau Jul 26, 2022
00674f7
Fix facet count tests
ellmau Jul 26, 2022
84aa627
Add multithread-safe functionality for the dictionary/ordering
ellmau Jul 27, 2022
c531413
Add first documentation structure
ellmau Jul 27, 2022
65de129
mv gh-pages to docs
ellmau Jul 27, 2022
b38c64a
Fix docs string
ellmau Jul 27, 2022
d4465fe
Simple version of gh pages
ellmau Jul 27, 2022
2b86e74
Fix some style issues
ellmau Jul 27, 2022
fa52a02
Added more links and information to the landing page
ellmau Jul 27, 2022
30c0ca6
Fix badges in the app-doc
ellmau Jul 27, 2022
44d41ec
Add two valued interpretation
ellmau Jul 28, 2022
e2e77ea
Refactor nogood-algorithm name
ellmau Jul 28, 2022
ab515e6
Update README.md
ellmau Jul 28, 2022
5fc720d
Fix link to binary and library subfolder
ellmau Jul 28, 2022
20131d7
Update main
ellmau Jul 28, 2022
c234bd4
Fix cli-test
ellmau Jul 28, 2022
deb7282
Update lib/README to match lib-documentation
ellmau Jul 29, 2022
e70d55f
Update Version to 0.3.0
ellmau Jul 29, 2022
e4c5718
Update Documentation navigation (#81)
ellmau Jul 29, 2022
c276372
Merge branch 'main' into milestone/nogoods
ellmau Aug 1, 2022
fac10dd
flake.lock: Update
ellmau Aug 2, 2022
b3b2632
Add type alias for NoGood
ellmau Aug 2, 2022
154b975
Apply review comments
ellmau Aug 2, 2022
5bada6f
Add documentation information about later revisions on VarContainer
ellmau Aug 2, 2022
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ tramp
*_flymake*

/tests/out/

# Ignore direnv data
/.direnv/

# ignore perfdata
perf.data
44 changes: 34 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ the Bundesministerium für Bildung und Forschung (BMBF, Federal Ministry of Educ
and by the [Center for Advancing Electronics Dresden](https://cfaed.tu-dresden.de) (cfaed).

# Affiliation
This work has been party developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).
This work has been partly developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).

# Disclaimer
Hosting content here does not establish any formal or legal relation to TU Dresden
2 changes: 1 addition & 1 deletion bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ the Bundesministerium für Bildung und Forschung (BMBF, Federal Ministry of Educ
and by the [Center for Advancing Electronics Dresden](https://cfaed.tu-dresden.de) (cfaed).

# Affiliation
This work has been party developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).
This work has been partly developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).

# Disclaimer
Hosting content here does not establish any formal or legal relation to TU Dresden
82 changes: 19 additions & 63 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@
description = "basic rust flake";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.url = "github:numtide/flake-utils";
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
flake-utils.url = "github:numtide/flake-utils";
gitignoresrc = {
url = "github:hercules-ci/gitignore.nix";
flake = false;
};
};

outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, flake-compat, gitignoresrc, rust-overlay, ... }@inputs:
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, gitignoresrc, rust-overlay, ... }@inputs:
{
#overlay = import ./nix { inherit gitignoresrc; };
} // (flake-utils.lib.eachDefaultSystem (system:
Expand All @@ -33,13 +35,15 @@
RUST_LOG = "debug";
RUST_BACKTRACE = 1;
buildInputs = [
pkgs.rust-bin.nightly.latest.rustfmt
pkgs.rust-bin.stable.latest.rustfmt
pkgs.rust-bin.stable.latest.default
unstable.rust-analyzer
pkgs.rust-analyzer
pkgs.cargo-audit
pkgs.cargo-license
pkgs.cargo-tarpaulin
pkgs.cargo-kcov
pkgs.valgrind
pkgs.gnuplot
pkgs.kcov
];
};
Expand Down
3 changes: 2 additions & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adf_bdd"
version = "0.2.4"
version = "0.2.5"
authors = ["Stefan Ellmauthaler <[email protected]>"]
edition = "2021"
homepage = "https://ellmau.github.io/adf-obdd/"
Expand Down Expand Up @@ -30,6 +30,7 @@ serde = { version = "1.0", features = ["derive","rc"] }
serde_json = "1.0"
biodivine-lib-bdd = "0.4.0"
derivative = "2.2.0"
roaring = "0.9.0"

[dev-dependencies]
test-log = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion lib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ the Bundesministerium für Bildung und Forschung (BMBF, Federal Ministry of Educ
and by the [Center for Advancing Electronics Dresden](https://cfaed.tu-dresden.de) (cfaed).

# Affiliation
This work has been party developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).
This work has been partly developed by the [Knowledge-Based Systems Group](http://kbs.inf.tu-dresden.de/), [Faculty of Computer Science](https://tu-dresden.de/ing/informatik) of [TU Dresden](https://tu-dresden.de).

# Disclaimer
Hosting content here does not establish any formal or legal relation to TU Dresden
Loading