Skip to content

Commit b3f1dbb

Browse files
lowercase tool name, results and full version of paper
1 parent 5f2a9db commit b3f1dbb

File tree

11 files changed

+3112
-16
lines changed

11 files changed

+3112
-16
lines changed
File renamed without changes.

FullPaper.pdf

491 KB
Binary file not shown.

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ chmod u+x bin/d4
1515
For now, [D4 compiler](http://www.cril.univ-artois.fr/KC/d4.html) and [Dsharp_PCompile](https://bitbucket.org/haz/dsharp) (modified for our use case, see the "PCompile" procedure) are included as default for compiling CNF to d-DNNF. Any other compiler can be easily used with slight modifications.
1616

1717
## Running WAPS
18-
You can run WAPS by using 'WAPS.py' Python script present in WAPS directory. A simple invocation looks as follows:
18+
You can run WAPS by using 'waps.py' Python script present in waps directory. A simple invocation looks as follows:
1919
```bash
20-
python3 WAPS.py <cnffile>
20+
python3 waps.py <cnffile>
2121
```
2222
The usage instructions and default values to arguments can be found by running
2323
```bash
24-
python3 WAPS.py -h
24+
python3 waps.py -h
2525
```
2626
## Weight Format
27-
WAPS support providing weights in CNF itself apart from being provided separately in a file. A type variable weight is in [0,inf], specified by line starting with 'w' ,literal, and weight separated by space. Later, WAPS normalizes it such that weight(l)+weight(-l)=1 where l is a literal. By default, every variable weight is set to 0.5, if its value is not given in CNF or the weightfile.
27+
WAPS supports providing weights in CNF itself apart from being provided separately in a file. Weight of a literal is in [0,inf], specified by line starting with 'w',literal, and weight separated by space. Later, WAPS normalizes it such that weight(l)+weight(-l)=1 where l is a literal. While weights for both positive and negative literals should be specified, if weight of only positive literal is specified, waps assumes it to be normalized and assigns weight of negative literal as 1 - weight(l). By default, every literal's weight is set to 0.5, if its value is not given in CNF or the weightfile.
2828

2929
## Specifying sampling set
30-
WAPS support providing sampling set in CNF itself. It is specified by lines starting with 'c ind' ,var indexes separated by space, and ended by 0. If sampling set is not provided, by default, every variable specified in formula is assumed to be a part of sampling set.
30+
WAPS supports providing sampling set in CNF itself. It is specified by lines starting with 'c ind' ,var indexes separated by space, and ended by 0. If sampling set is not provided, by default, every variable specified in formula is assumed to be a part of sampling set.
3131

3232
## Output Format
3333
The output samples are stored in samples.txt by default. Each line of the output consists of a serial number of the sample followed by a satisfying assignment projected on sampling set. The satisfying assignment consists of literals seperated by space. Note that turning random assignment (--randAssign) to 0 can lead to partial assignments in each line. In such cases, the unassigned sampling variables can be chosen to be True or False.
@@ -50,13 +50,13 @@ chmod u+x Dsharp_PCompile
5050
chmod u+x d4
5151
sudo mv Dsharp_PCompile /usr/local/bin/
5252
sudo mv d4 /usr/local/bin/
53-
pip install WAPS
53+
pip install waps
5454
```
5555
Please reload your shell so that binaries are accessible via PATH.
5656

5757
A typical usage is as follows:
5858
```python
59-
from WAPS import sampler
59+
from waps import sampler
6060

6161
sampler = sampler(cnfFile="toy.cnf")
6262
sampler.compile()
@@ -68,7 +68,7 @@ print(list(samples))
6868

6969
You can find more information on usage by:
7070
```python
71-
from WAPS import sampler
71+
from waps import sampler
7272
help(sampler)
7373
```
7474

Runtime Results/Table1(Runtime Comparison).csv

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

Runtime Results/Table2(Incremental Sampling).csv

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

Runtime Results/Table3(Scaling Results).csv

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

Runtime Results/Table4(Conditioning Results).csv

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

WAPS/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99

1010
setup(
11-
name = 'WAPS',
12-
packages = ['WAPS'],
13-
version = 'v1.0',
11+
name = 'waps',
12+
packages = ['waps'],
13+
version = 'v1.0.2',
1414
license='MIT',
1515
description = 'This library can be used to sample satisfying assignments for a CNF/DNF obeying a given literal-weighted weight function and projected upon a given sampling set.',
1616
long_description=long_description,
1717
long_description_content_type='text/markdown',
1818
author = 'Rahul Gupta',
1919
author_email = 'rahujupiter@gmail.com',
20-
url = 'https://github.com/meelgroup/WAPS/',
21-
download_url = 'https://github.com/meelgroup/WAPS/archive/v1.0.tar.gz',
20+
url = 'https://github.com/meelgroup/waps/',
21+
download_url = 'https://github.com/meelgroup/waps/archive/v1.0.2.tar.gz',
2222
keywords = ['sampling', 'cnf', 'weighted sampling', 'projected sampling', 'dDNNF'], # Keywords that define your package best
2323
install_requires=[
2424
'numpy',
@@ -37,4 +37,4 @@
3737
'Programming Language :: Python :: 3.6',
3838
'Programming Language :: Python :: 3.7'
3939
],
40-
)
40+
)

waps/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from waps.waps import sampler

0 commit comments

Comments
 (0)