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

Addingglobals channel #488

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Addingglobals channel #488

wants to merge 14 commits into from

Commits on May 23, 2024

  1. Channel constraint (used to link integer variable to array of boolean… 

    … indicators)
    @363734
    363734 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3200f09 View commit details
    Browse the repository at this point in the history

  2. Channel constraint (used to link two arrays: asymmetric version)

    @363734
    363734 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8ba756a View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Channel constraint (used to link values of one array together)

    @363734
    363734 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0f89bf9 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. InverseOne as separate global

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c30a90d View commit details
    Browse the repository at this point in the history

  2. Inverse tests

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    3c3f5c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into addingglobals-channel 

    # Conflicts:
#	cpmpy/expressions/__init__.py
#	cpmpy/expressions/globalconstraints.py
    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    74649a1 View commit details
    Browse the repository at this point in the history

  4. merge with new test suite

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    1d0ec0e View commit details
    Browse the repository at this point in the history

  5. Fixing value of inverseOne

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e94fcff View commit details
    Browse the repository at this point in the history

  6. new tests

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    287464c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into addingglobals-channel

    @Dimosts
    Dimosts committed May 28, 2024
    Configuration menu
    Copy the full SHA
    44cfce1 View commit details
    Browse the repository at this point in the history

  8. rm inverseOne from reify test (as Inverse) because of partial function

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    70bddbf View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/addingglobals-channel' into addi… 

    …ngglobals-channel
    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    d0e481a View commit details
    Browse the repository at this point in the history

  10. rm Channel from reify test (as Inverse) because of partial function

    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    63cfab0 View commit details
    Browse the repository at this point in the history

  11. rm InverseIne and Channel from testing with minizinc too as they get … 

    …decomposed (cft total vs partial function problem for reification)
    @363734
    363734 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    5d306f9 View commit details
    Browse the repository at this point in the history