Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fdabrandao/vpsolver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: fdabrandao/vpsolver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.0
Choose a head ref
  • 19 commits
  • 39 files changed
  • 1 contributor

Commits on Jul 22, 2015

  1. prepare release v1.3.0-alpha

    @fdabrandao
    fdabrandao committed Jul 22, 2015

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 88CC3F27732845AD
    Learn about vigilant mode
    Copy the full SHA
    6aea82b View commit details

  2. minor correction

    @fdabrandao
    fdabrandao committed Jul 22, 2015

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 88CC3F27732845AD
    Learn about vigilant mode
    Copy the full SHA
    2123729 View commit details

  3. bugfix

    @fdabrandao
    fdabrandao committed Jul 22, 2015
    Copy the full SHA
    f997876 View commit details

  4. minor correction

    @fdabrandao
    fdabrandao committed Jul 22, 2015
    Copy the full SHA
    7e199db View commit details

Commits on Jul 23, 2015

  1. improve symbolic name parsing

    @fdabrandao
    fdabrandao committed Jul 23, 2015
    Copy the full SHA
    99b4a77 View commit details

  2. rename modlang -> pympl

    @fdabrandao
    fdabrandao committed Jul 23, 2015
    Copy the full SHA
    844f19a View commit details

  3. remove command from pympl

    @fdabrandao
    fdabrandao committed Jul 23, 2015
    Copy the full SHA
    b51af09 View commit details

Commits on Jul 26, 2015

  1. improve pympl regex

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    bf98296 View commit details

  2. remove EVAL command from pympl

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    d7a808e View commit details

  3. minor correction

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    e206a49 View commit details

  4. improve pympl regex

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    eaafac4 View commit details

  5. update docs

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    7ee9213 View commit details

  6. update README

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    e6866c3 View commit details

  7. improve PyMPL CmdCon command

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    2cf8872 View commit details

  8. add PyMPL unittests

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    6b70668 View commit details

  9. minor correction

    @fdabrandao
    fdabrandao committed Jul 26, 2015
    Copy the full SHA
    a14d43f View commit details

Commits on Jul 27, 2015

  1. update docs

    @fdabrandao
    fdabrandao committed Jul 27, 2015
    Copy the full SHA
    a8a90e1 View commit details

  2. update webapp

    @fdabrandao
    fdabrandao committed Jul 27, 2015
    Copy the full SHA
    410af1f View commit details

  3. prepare release v1.3.0

    @fdabrandao
    fdabrandao committed Jul 27, 2015
    Copy the full SHA
    61d7520 View commit details
Showing with 2,313 additions and 160 deletions.
  1. +4 −1 README.md
  2. +1 −0 docs/.gitignore
  3. +4 −0 docs/Docker.md
  4. +6 −5 docs/Home.md
  5. +570 −0 docs/PyMPL.md
  6. +4 −1 docs/README.md
  7. +163 −0 docs/html/Docker
  8. +123 −0 docs/html/Home
  9. +905 −0 docs/html/PyMPL
  10. +269 −0 docs/html/README
  11. +1 −1 pyvpsolver/{modlang → pympl}/__init__.py
  12. 0 pyvpsolver/{modlang → pympl}/cmd/__init__.py
  13. 0 pyvpsolver/{modlang → pympl}/cmd/base.py
  14. +3 −3 pyvpsolver/{modlang → pympl}/cmd/data.py
  15. +8 −12 pyvpsolver/{modlang → pympl}/cmd/flow.py
  16. +2 −2 pyvpsolver/{modlang → pympl}/cmd/graph.py
  17. +5 −5 pyvpsolver/{modlang → pympl}/cmd/loadvbp.py
  18. +6 −5 pyvpsolver/{modlang → pympl}/cmd/model.py
  19. 0 pyvpsolver/{modlang → pympl}/glpk.py
  20. +34 −29 pyvpsolver/{modlang → pympl}/parser.py
  21. 0 pyvpsolver/{modlang → pympl}/test/equivknapsack.mod
  22. +2 −2 pyvpsolver/{modlang → pympl}/test/equivknapsack.py
  23. 0 pyvpsolver/{modlang → pympl}/test/equivknapsack01.mod
  24. +2 −2 pyvpsolver/{modlang → pympl}/test/equivknapsack01.py
  25. 0 pyvpsolver/{modlang → pympl}/test/graph.mod
  26. +2 −2 pyvpsolver/{modlang → pympl}/test/graph.py
  27. 0 pyvpsolver/{modlang → pympl}/test/instance.mod
  28. +2 −2 pyvpsolver/{modlang → pympl}/test/instance.py
  29. 0 pyvpsolver/{modlang → pympl}/test/instance.vbp
  30. 0 pyvpsolver/{modlang → pympl}/test/test.py
  31. 0 pyvpsolver/{modlang → pympl}/test/tmp/.gitignore
  32. +78 −44 pyvpsolver/{modlang → pympl}/test/unittests.py
  33. +101 −24 pyvpsolver/{modlang → pympl}/utils.py
  34. +2 −5 pyvpsolver/{modlang → pympl}/writemod.py
  35. +13 −13 pyvpsolver/webapp/app.py
  36. 0 pyvpsolver/webapp/data/examples/{modlang → pympl}/example1.mod
  37. 0 pyvpsolver/webapp/data/examples/{modlang → pympl}/example2.mod
  38. +1 −0 pyvpsolver/webapp/templates/input.html
  39. +2 −2 setup.py
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -49,11 +49,14 @@ $ bash compile.sh
With the python interface:

```bash
$ pip install -r requirements.txt
$ sudo pip install -r requirements.txt
$ sudo python setup.py install
```

## Alternative setup using Docker

Docker is an open platform for building, shipping and running applications. Docker allows VPSolver to run on a large variety of platforms with very little effort.

Install Docker [[Docker installation instructions](https://docs.docker.com/installation/)].

Option 1: simply `pull` VPSolver from Docker repository (without building):
1 change: 1 addition & 0 deletions docs/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*~
/git_push.sh
/git_fetch.sh
/generate_html.sh
4 changes: 4 additions & 0 deletions docs/Docker.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Docker

Docker is an open platform for building, shipping and running applications. Docker allows VPSolver to run on a large variety of platforms with very little effort.

## Docker Setup
Install Docker [[Docker installation instructions](https://docs.docker.com/installation/)].

11 changes: 6 additions & 5 deletions docs/Home.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
VPSolver
------------------
# VPSolver

VPSolver is a vector packing solver based on an arc-flow formulation with graph compression [[Poster][poster]]. VPSolver generates very strong models (equivalent to Gilmore and Gomory's) that can be solved using general-purpose mixed-integer programming solvers such as Gurobi and GLPK [[Paper][paper]].
[poster]: http://www.dcc.fc.up.pt/~fdabrandao/papers/arcflow_poster.pdf
[paper]: http://www.dcc.fc.up.pt/~fdabrandao/Vector_Packing_Solver

### Wiki pages
## Wiki pages
* [README](README)
* [Docker Setup](Docker)
* [Docker setup](Docker)
* [PyMPL documentation](PyMPL)

### Useful links
## Useful links
* Project Homepage: [http://vpsolver.dcc.fc.up.pt/](http://vpsolver.dcc.fc.up.pt/)
* GiHub repository: [https://github.com/fdabrandao/vpsolver](https://github.com/fdabrandao/vpsolver)
* BitBucket repository: [https://bitbucket.org/fdabrandao/vpsolver](https://bitbucket.org/fdabrandao/vpsolver)
Loading