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.

Sign up for GitHub

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

Jump to bottom

Pysat wsum #114

Draft
wants to merge 56 commits into
base: master
Choose a base branch
from
Draft

Pysat wsum #114

wants to merge 56 commits into from

Commits on Mar 17, 2022

  1. First implmenetation of pysat weighted sum with a psuedo boolean solver

    @sourdough-bread
    sourdough-bread committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    29777d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. adding the x - y or -x + y case

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    00e3799 View commit details
    Browse the repository at this point in the history

  2. handling the x - 3*y

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    a6b5b74 View commit details
    Browse the repository at this point in the history

  3. handling the x - 3*y

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    b009795 View commit details
    Browse the repository at this point in the history

  4. adding test case

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    0ed2677 View commit details
    Browse the repository at this point in the history

  5. adding test case

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    404d2e2 View commit details
    Browse the repository at this point in the history

  6. adding trivial test case

    @sourdough-bread
    sourdough-bread committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    f816000 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Hybrid Cardenc in case of sum and PBEnc in case of wsum

    @sourdough-bread
    sourdough-bread committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    f808883 View commit details
    Browse the repository at this point in the history

  2. Hybrid Cardenc in case of sum and PBEnc in case of wsum

    @sourdough-bread
    sourdough-bread committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    267f7b1 View commit details
    Browse the repository at this point in the history

  3. removing adaptations to core, such that the model stays true to the u… 

    …ser's input
    @sourdough-bread
    sourdough-bread committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    8ab3f5f View commit details
    Browse the repository at this point in the history

  4. Improved test cases

    @sourdough-bread
    sourdough-bread committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    67774ba View commit details
    Browse the repository at this point in the history

  5. added rewrite rules for flattening model that distributes - to muls a… 

    …nd wsum
    @sourdough-bread
    sourdough-bread committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    d1683b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Removed space in rumul

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    3db2a51 View commit details
    Browse the repository at this point in the history

  2. removing extra flattening+added cases for wsum_make

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    fa2deb2 View commit details
    Browse the repository at this point in the history

  3. removing printing

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    3acc3b7 View commit details
    Browse the repository at this point in the history

  4. ADding comments

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    fac595c View commit details
    Browse the repository at this point in the history

  5. simplyfying the wsum_make calls

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    e07a10b View commit details
    Browse the repository at this point in the history

  6. seperate _wsum_should of flatten to _wsum_should_flatten hadnling the… 

    … - case
    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    7e9be25 View commit details
    Browse the repository at this point in the history

  7. seperate _wsum_should of flatten to _wsum_should_flatten hadnling the… 

    … - case
    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    bf16cbe View commit details
    Browse the repository at this point in the history

  8. Adding wsum_make for special cases into the flattening

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    4d3dbd1 View commit details
    Browse the repository at this point in the history

  9. Adding wsum_make for special cases into the flattening

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    d2885e1 View commit details
    Browse the repository at this point in the history

  10. Adding wsum_make for special cases into the flattening

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    2da89ec View commit details
    Browse the repository at this point in the history

  11. Adding wsum_make for special cases into the flattening

    @sourdough-bread
    sourdough-bread committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    ea10231 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. minor cleanups

    Tias Guns committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    5f12a4a View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Merging flattening with wsum

    @sourdough-bread
    sourdough-bread committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    0149425 View commit details
    Browse the repository at this point in the history

  2. removing version checking with pysat

    @sourdough-bread
    sourdough-bread committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    d96d642 View commit details
    Browse the repository at this point in the history

  3. -abs(exp) expressions should not be transformed into wsum

    @sourdough-bread
    sourdough-bread committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    3a19d68 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Merge branch 'master' into pysat_wsum

    @sourdough-bread
    sourdough-bread committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    c5ebdcc View commit details
    Browse the repository at this point in the history

  2. rolling back transformations

    @sourdough-bread
    sourdough-bread committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    bca039b View commit details
    Browse the repository at this point in the history

  3. running all tests

    @sourdough-bread
    sourdough-bread committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    325cb49 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Merge branch 'master' into pysat_wsum

    @sourdough-bread
    sourdough-bread committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    bfd11de View commit details
    Browse the repository at this point in the history

  2. adding tests for pysat

    @sourdough-bread
    sourdough-bread committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    e5fd82a View commit details
    Browse the repository at this point in the history

  3. Adding model check if Bool-based

    @sourdough-bread
    sourdough-bread committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    f90c836 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Updated tests for wsum:int and wsum:bool to test pysat

    @IgnaceBleukx
    IgnaceBleukx committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    51af5d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. fixed condition in tests

    @IgnaceBleukx
    IgnaceBleukx committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    897ab6e View commit details
    Browse the repository at this point in the history

  2. special case for a * b > 1

    @IgnaceBleukx
    IgnaceBleukx committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    e3ed926 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'master' into pysat_wsum 

    # Conflicts:
#	cpmpy/solvers/pysat.py
#	tests/test_constraints.py
    @IgnaceBleukx
    IgnaceBleukx committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    11240f9 View commit details
    Browse the repository at this point in the history

  2. merged master into pysat_wsum

    @IgnaceBleukx
    IgnaceBleukx committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    eca6cbd View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. pysat: accept reified cardinality constraints 

    refactor to directly call the transformations

split out cardinality encoding in a function so that it can also be used for
implied constraints

fixes #296
    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    aeb9021 View commit details
    Browse the repository at this point in the history

  2. clean up commit before merging latest master

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    82840ce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into pysat_wsum

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    96d7dc2 View commit details
    Browse the repository at this point in the history

  4. Merge branch '296-pysat-reified-cardinality' into pysat_wsum

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    eb765c2 View commit details
    Browse the repository at this point in the history

  5. pysat: support reified wsums

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    b043915 View commit details
    Browse the repository at this point in the history

  6. pysat: disable 'mul' tests, we dont support/rewrite a mul of two vars

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    ad33826 View commit details
    Browse the repository at this point in the history

  7. enable all tests; z3 mul of two (bool?)vars is failing, should it?

    @tias
    tias committed May 24, 2023
    Configuration menu
    Copy the full SHA
    624719c View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. merge master into pysat_wsum branch

    @IgnaceBleukx
    IgnaceBleukx committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    ae059e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge branch 'master' into pysat_wsum

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    07f8b26 View commit details
    Browse the repository at this point in the history

  2. add wsum([c,bvs]) 'comp' const case

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    d937513 View commit details
    Browse the repository at this point in the history

  3. extra tests for non-const RHS. Use existing transformation?

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    94c3d8d View commit details
    Browse the repository at this point in the history

  4. add linearize to pysat?

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    d0ad014 View commit details
    Browse the repository at this point in the history

  5. remove two edge-cases on !=, make comment on rewrite

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    586fddf View commit details
    Browse the repository at this point in the history

  6. tests:pb actually test what happens with too large bounds

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    74803bb View commit details
    Browse the repository at this point in the history

  7. add more (failing) tests

    @tias
    tias committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    b313c69 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. allow for "and" and "or" to be supported

    @IgnaceBleukx
    IgnaceBleukx committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c2daf46 View commit details
    Browse the repository at this point in the history

  2. allow for "and" and "or" to be supported

    @IgnaceBleukx
    IgnaceBleukx committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    09d03c4 View commit details
    Browse the repository at this point in the history

  3. fix test

    @IgnaceBleukx
    IgnaceBleukx committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    d9df156 View commit details
    Browse the repository at this point in the history