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

Draco JS rewrite #96

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
551f26c
Initial commit of refactor.
haldenl Jun 2, 2019
9613fcd
Add additional constraints, tests, improve naming, fix small bugs.
haldenl Jun 3, 2019
d1c600d
Add data parsing + temporal.
haldenl Jun 3, 2019
11af692
Fix fact asp.
haldenl Jun 3, 2019
1e52945
Update README.md
haldenl Jun 3, 2019
64cca6e
Add travis.
haldenl Jun 3, 2019
5942da6
Merge branch 'ndraco' of github.com:uwdata/draco into ndraco
haldenl Jun 3, 2019
18e0f4b
Fix temporal c_d soft constraint.
haldenl Jun 3, 2019
aee47a2
Refactor tests, add additional constraints.
haldenl Jun 4, 2019
702ad0f
Add typing and module to package.
haldenl Jun 4, 2019
2d67b1d
Add typings and esmodule exports.
haldenl Jun 4, 2019
2e801e0
Fix imports and remove encoding comparison integrity constraint.
haldenl Jun 4, 2019
07a2254
Remove extra stack generation.
haldenl Jun 4, 2019
43fc4a7
Add functions for generation declarations in Data, fix constraints.
haldenl Jun 4, 2019
53b9e8d
Fix encoding_fact(raw...
haldenl Jun 5, 2019
c571b4b
Add version.
haldenl Jun 5, 2019
93ea663
Change IMDB test case to scatter.
haldenl Jun 5, 2019
f3897d7
Fix temporal constraint.
haldenl Jun 5, 2019
b6cb9da
Add cardinality soft constraints.
haldenl Jun 5, 2019
cbaedaa
Uncomment continuous_channel.
haldenl Jun 5, 2019
7829808
Rewrite options.
haldenl Jun 5, 2019
2796381
Refactor data lp.
haldenl Jun 25, 2019
39a88f1
Remove old data generate.
haldenl Jun 25, 2019
d9e0f07
Allow generateData in Draco API.
haldenl Jun 27, 2019
e97727b
Reduce number of max fields.
haldenl Jun 27, 2019
1b7a722
Reduce number of max fields.
haldenl Jun 27, 2019
d890689
Fix merge.
haldenl Jun 27, 2019
f312113
Add constraint for boolean gen.
haldenl Jun 28, 2019
1c38dae
Merge branch 'ndraco' of github.com:uwdata/draco into ndraco
haldenl Jun 28, 2019
8df9da2
Add more generation constraints.
haldenl Jun 29, 2019
557e173
Fix data gen hard constraints.
haldenl Jun 29, 2019
8488545
Fix data gen hard constraints.
haldenl Jun 29, 2019
ae4b785
Merge branch 'ndraco' of github.com:uwdata/draco into ndraco
haldenl Jun 29, 2019
af39dff
Update generate.
haldenl Jul 9, 2019
2d87bdf
Options for generation.
haldenl Jul 29, 2019
41d0f5a
Fix binning bugs.
haldenl Aug 14, 2019
15fa9a0
Fix bin parsing bug for facts2vl.
haldenl Aug 14, 2019
9135ed6
Fix encoding checks.
haldenl Aug 27, 2019
67b654d
Fix falsey bin.
haldenl Aug 28, 2019
1c7c652
Add generate extra encodings option.
haldenl Aug 28, 2019
e9c1934
Add option to (not) generate extra encodings.
haldenl Aug 29, 2019
f644ff6
Update test.
haldenl Aug 30, 2019
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
28 changes: 3 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,11 @@
language: python
python:
- "3.6"
cache:
- pip
- yarn
language: node_js
node_js: 12
cache: yarn
before_install:
# install conda
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# install yarn
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.12.1
- export PATH="$HOME/.yarn/bin:$PATH"
# Useful for debugging any issues with conda
- conda info -a
install:
- yarn
- yarn --cwd js
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION coveralls
- source activate test-environment
# now we are in an environment
- conda install -c potassco clingo
- pip install -r requirements.txt
- pip install -e .
script:
- yarn --cwd js build
- python setup.py test
after_success:
- coveralls
10 changes: 0 additions & 10 deletions MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Formalizing Visualization Design Knowledge as Constraints

[![Build Status](https://travis-ci.org/uwdata/draco.svg?branch=master)](https://travis-ci.org/uwdata/draco)
[![Build Status](https://travis-ci.org/uwdata/draco.svg?branch=ndraco)](https://travis-ci.org/uwdata/draco)
[![Coverage Status](https://coveralls.io/repos/github/uwdata/draco/badge.svg?branch=master)](https://coveralls.io/github/uwdata/draco?branch=master)
[![PyPi](https://img.shields.io/pypi/v/draco.svg)](https://pypi.org/project/draco/)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
Expand Down
252 changes: 0 additions & 252 deletions asp/Readme.md

This file was deleted.

13 changes: 0 additions & 13 deletions asp/_all.lp

This file was deleted.

34 changes: 0 additions & 34 deletions asp/_apt.lp

This file was deleted.

12 changes: 0 additions & 12 deletions asp/_cost.lp

This file was deleted.

7 changes: 0 additions & 7 deletions asp/_enumerate.lp

This file was deleted.

14 changes: 0 additions & 14 deletions asp/_kim2018.lp

This file was deleted.

Loading