Skip to content

Commit

Permalink
Feature/issue 22 extra binary (#24)
Browse files Browse the repository at this point in the history
Split lib and bin into two directories

* modified workflow, readmes, documentation, ...
* excluded flake.lock from the package
* SET new patch version
  • Loading branch information
ellmau authored Feb 23, 2022
1 parent 565fef9 commit c6837ff
Show file tree
Hide file tree
Showing 10 changed files with 969 additions and 210 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUSTTARGET: ${{ matrix.target }}
EXTRA_FILES: "README.md LICENSE"
SRC_DIR: "."
SRC_DIR: "bin/"
#release_without_not_required:
# name: release ${{ matrix.target }}
# runs-on: ubuntu-latest
Expand Down
24 changes: 8 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
[package]
name = "adf_bdd"
version = "0.2.0"
version = "0.2.1"
authors = ["Stefan Ellmauthaler <[email protected]>"]
edition = "2021"
repository = "https://github.com/ellmau/adf-obdd/"
license = "GPL-3.0-only"
exclude = ["res/", "./flake*", "*.nix", ".envrc", "_config.yml"]
exclude = ["res/", "./flake*", "flake.lock", "*.nix", ".envrc", "_config.yml"]

description = "Solver for ADFs grounded, complete, and stable semantics by utilising OBDDs - ordered binary decision diagrams"
description = "Library to solve grounded, complete, and stable ADF-semantics by utilising OBDDs - ordered binary decision diagrams"
build = "build.rs"


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[[bin]]
name="adf_bdd"
[lib]
name="adf_bdd"
path = "src/lib.rs"
Expand All @@ -26,10 +22,7 @@ edition = "2021" # The edition of the target.
crate-type = ["lib"] # The crate types to generate.

[dependencies]
clap = "2.33.*"
structopt = "0.3.25"
log = { version = "0.4", features = [ "max_level_trace", "release_max_level_info" ] }
env_logger = "0.9"
log = { version = "0.4"}
nom = "7.1.0"
lexical-sort = "0.3.1"
serde = { version = "1.0", features = ["derive","rc"] }
Expand All @@ -38,14 +31,13 @@ biodivine-lib-bdd = "0.3.0"
derivative = "2.2.0"

[dev-dependencies]
test-log = "0.2.*"
test-log = "0.2"
env_logger = "0.9"
quickcheck = "1"
quickcheck_macros = "1"
assert_cmd = "2.0"
predicates = "2.1"
assert_fs = "1.0"

[features]
default = ["adhoccounting"]
adhoccounting = [] # count models ad-hoc - disable if counting is not needed
importexport = []
importexport = []

11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ellmau/adf-obdd/Code%20coverage%20with%20tarpaulin) [![Coveralls](https://img.shields.io/coveralls/github/ellmau/adf-obdd)](https://coveralls.io/github/ellmau/adf-obdd) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/ellmau/adf-obdd?include_prereleases) ![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/ellmau/adf-obdd?label=release%20from) ![GitHub top language](https://img.shields.io/github/languages/top/ellmau/adf-obdd) ![GitHub all releases](https://img.shields.io/github/downloads/ellmau/adf-obdd/total) ![GitHub Discussions](https://img.shields.io/github/discussions/ellmau/adf-obdd)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ellmau/adf-obdd/Code%20coverage%20with%20tarpaulin) [![Coveralls](https://img.shields.io/coveralls/github/ellmau/adf-obdd)](https://coveralls.io/github/ellmau/adf-obdd) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/ellmau/adf-obdd?include_prereleases) ![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/ellmau/adf-obdd?label=release%20from) ![GitHub top language](https://img.shields.io/github/languages/top/ellmau/adf-obdd) ![GitHub all releases](https://img.shields.io/github/downloads/ellmau/adf-obdd/total) ![GitHub Discussions](https://img.shields.io/github/discussions/ellmau/adf-obdd) ![rust-edition](https://img.shields.io/badge/Rust--edition-2021-blue?logo=rust)

# Solver for ADFs grounded semantics by utilising OBDDs - ordered binary decision diagrams


Expand All @@ -7,7 +8,7 @@ An abstract dialectical framework (ADF) consists of abstract statements. Each st
## Ordered Binary Decision Diagram
An ordered binary decision diagram is a normalised representation of binary functions, where satisfiability- and validity checks can be done relatively cheap.

## Usage
## Usage of the binary
```
USAGE:
adf_bdd [FLAGS] [OPTIONS] <input>
Expand Down Expand Up @@ -64,7 +65,11 @@ The binary predicate ac relates each statement to one propositional formula in p
- c(v): constant symbol "verum" - tautology/top
- c(f): constant symbol "falsum" - inconsistency/bot

# Development notes
# Features

`adhoccounting` will cache the modelcount on-the-fly during the construction of the BDD

# Development notes
To run all the tests placed in the submodule you need to run
```bash
$> git submodule init
Expand Down
Loading

0 comments on commit c6837ff

Please sign in to comment.